Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Sourcetree is not helping in resolving merge conflicts

Sourcetree is not helping in resolving merge conflicts. I tried to configure Beyond compare as external merge tool. But Sourctree doesn't launch Beyond compare tool at all. It keeps creating backup files which is annoying. Please help 

1 answer

I understand your frustration with Sourcetree and the challenges you're facing with resolving merge conflicts. Configuring external merge tools like Beyond Compare can be tricky sometimes. To troubleshoot the issue, ensure that you've correctly set up Beyond Compare as the external tool in Sourcetree preferences. Double-check the path and executable settings. Additionally, consider checking Beyond Compare's configuration to ensure it's properly installed and accessible from the command line. If Sourcetree continues to create backup files, review its settings to see if there's an option to disable or modify the behavior. It might also be helpful to consult Sourcetree's documentation or community forums for specific troubleshooting steps. I hope this guidance assists you in resolving the merge conflict issues with Sourcetree and Beyond Compare.

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events