It's not the same without you
Join the community to find out what other Atlassian users are discussing, debating and creating.
I can get Beyond Compare 4 to work as the diff tool however not as the merge tool even if I configure it as a custom merge tool. The merge box pops up for moment and then goes away. If this can't be explained I'd like to know if there is a way I can determine the error I am running into it so I have some evidence to help solve the problem. Thank you!!!
If you notice I said I already did that. I cannot get it to work either setting it directly or setting it as custom. I continued to play around with it and I have learned that I have a bigger issue. I think somehow my source tree has gotten into a bad state. I am unable to even use the original merge tool I had configured which is TortoiseMerge. Only the difference viewer seems to work.
I misunderstood, I thought you only used the custom option. Anyway. If this happens with any merge program, I'm not sure how you could fix it. You could try updating/reinstalling SourceTree. [Are SourceTree and BC both installed to their default locations?]
Before I saw your second response I had already removed my repository and started the check out process again. I am going to see if that cleans up anything. If not I will try the re-install. As for your question both are installed in the default locations.
You would be correct. As it turns out ALL choices I tried other than System Default did not work. I then configured git to use beyond compare and put it back to system default and that worked great.
This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.
Read moreSupported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
Connect with like-minded Atlassian users at free events near you!
Find a groupConnect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.
Start an AUGYou're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.