In Sourcetree, I've selected DiffMerge as my external diff and merge tool, and when I select a file with conflicts I can launch it to compare diffs using "Actions/External Diff". But I cannot launch it to perform merges using "Actions/Resolve Conflicts/Launch External Merge Tool", as this menu option is greyed out. (In fact, all of the option in "Resolve Conflicts" are greyed out entirely. Any suggestions?
Hmmm... sorry for my noobiness here. When I select the file in Sourcetree, it shows me what I thought was the conflict markup (hunks with green/red +/- lines). However if I go to the File Status view and select "Conflicts" from the dropdown menu, nothing shows up. Looking into the menu above the code hunks, it's set to "Diff vs. parent". But in the code itself, there are all sorts of lines like
and so forth. So I would have thought this should be treated as a file to be merged?
However when I go to the File Status view, this file is just flagged as "modified", not "conflicted".
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs