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".
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
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