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

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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 votes
minnsey Atlassian Team Jun 22, 2017

Hi

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
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

5,011 views 0 12
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you