Git Merge With Commitment