SourceTree doesn't detect merge after using meld

After do a merge using "Merge using external tool" everything works as usual and my merge tool, meld pops up, I merge my file and then save and close it. SourceTree still marks the file as unresovled, and when I go to the file I can see that it has in fact been merged.

1 answer

0 vote


SourceTree for Windows relies on the return code from the external tool to determine if the merge was completed successfully. We do not test with Meld, it maybe that it doesn't return the code we expect.

As a work around you can complete the process by using the context menu to mark the merge resolved for the file.

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported 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 ...

670 views 0 4
Read article

Atlassian User Groups

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!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you