Fixing git merge conflicts : discard selected lines always resets my view?

Michael E

I'm trying to fix git merge conflicts on my .xcodeproj file. Since I want to accept changes from both merged branches, this involves me selecting the various git inserted data (<<<<<<< HEAD, >>>>>>> BRANCH, and ======) and using "discard selected lines" to fix the merge conflict. Each time I discard a line, the view resets and HEAD is selected in the commit tree. As you can imagine, having to scroll down the same file for the 10th time to discard one line at a time is not very user friendly.

I'm guessing I must be going about resolving conflicts in the xcodeproj the wrong way...how should I do it?

stevestreeting

You're actually far better to use an external merge tool to do this. FileMerge (free with XCode) does an admirable job and is the default configuration, you can just right-click the conflict and select Resolve > Resolve in Visual Merge Tool. Then you can resolve all the conflicts at once (discarding if you want) before returning to SourceTree.