Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,367,534
Community Members
 
Community Events
168
Community Groups

External Merge tool Conflicts not displayed

Hi

I am using SourceTree with Beyond Compare and kdiff3 . This has always worked fine. Today, when I right click->resolve using external diff tool, I get a window for a second showing that the launch is happening, and then nothing and the conflict disappears as though resolved. This is really bad as I am unable to merge changes.

Going into preferences, I tried to change the diff tool, but I can't click on any of the values - everything seems to be locked.

Help?

My Config.jpgAnswer

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events