SourceTree doesn't detect merge after using meld

[Tjaart Blignaut]

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.

[minnsey]

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.