Stricken with fear at the thought of handling a huge conflicted merge file by file, when you know you can just pick one side of the conflict and be done with it?
When
git pull
gives you the bad news...
git mergetool
is usually the first recourse.
Used meld, my default for git mergetool, for the first one. Which fortunately was the only one i wanted to merge manually.
I refused to merge the next one and then took the provided opportunity to cancel the merge.
Then:
Except where otherwise noted, content on this site is licensed under a Creative Commons Attribution 3.0 Unported License.
