djwonk

I just read a cool idea from the Git Internals PDF by Scott Chacon on page 33. If you don’t know how well a merge might work, just create a new branch and try the merge there. If it works, it will be easy enough to merge into your master branch as a next step.

Something that Mr. Chacon didn’t mention (at least not in the vicinity of page 33) is that there is a –no-commit flag on the git merge command:


--no-commit
Perform the merge but pretend the merge failed and do not
autocommit, to give the user a chance to inspect and further tweak
the merge result before committing.