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

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


1 badge earned


Participate in fun challenges

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


Gift kudos to your peers

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


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!


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
Community Members
Community Events
Community Groups

External Diff Tool does not launch and files get stuck in Merge.

I've seen many posts about external diff tool not launching but I haven't been able to find a solution that works for me. While I have some experience with Git from years ago, Sourcetree is new to me and I'm not that familiar with the command line, so the solutions I've found so far have confusing and I'm not sure if I'm implementing them correctly. 


Basically what happens is I try to resolve a conflict by launching the external diff tool, but rather than launching the file seems to automatically start a merge that then gets stuck. The little warning sign next to the file disappears and when I try to Pull or Push, I get the following error, which forces me to commit the merge before moving forward: 

error: You have not concluded your merge (MERGE_HEAD exists).

hint: Please, commit your changes before merging.

fatal: Exiting because of unfinished merge.

Completed with errors, see above



0 answers

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events