I have tried every available config for external merge tools, beyond compare is my preference, but whatever I try the menu to launch it is disabled. I've tried each option on the preconfigured dropdown and a custom path direct to beyond compare. What can I do to fix this? I can't fix my conflicts!
I tried the same again and here is a larger screenshot:-
I recognise that the file icon show "modified" not "conflict", but look at the change log on the right.
What does "<<<<< HEAD" indicate ? is that a conflict or not?
Yeah, there was a conflict, but for some reason Git doesn't recognize it as one. Git should set an internal flag whenever the conflict markers are written to the file, but it definitely does not scan the file contents for conflict markers. Try choosing the "Mark Unresolved" option, or maybe "Restart Merge".
My guess is that one of the previous commit had a merge and it was not resolved correctly either by you or someone else. so the markers was committed to git. you may open that file in a text editor and manually remove those markers and duplicate code .
Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG