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

External merge tool does not start when trying to resolve conflicts

Rudy Vigneault Jul 07, 2017

I have a file for which I had stashed changes. I pulled changes from the repository and when applying the stashed changes there were conflicts.

Only the content of the file changed (the name is the same and the file was not removed nor moved).

When I right click on the file and select "Resolve Conflicts">"Launch External Merge Tool" the "Visual Merge In Progress" window appears but the application does not start.

If I click on "Abort", I see that the *_BACKUP_*, *_BASE_*, *_LOCAL_* and *_REMOTE_* files were created.

Launching the tool works for diff but not for merge. This is quite new since it used to work.

I am using SourceTree v2.1.2.5 and I my external Merge Tool is configured to be Araxis Merge.

3 answers

0 votes
Rudy Vigneault Jul 07, 2017 • edited

One thing that I noticed: I cannot diff the file using the external tool while it is flagged as conflicting (i.e. the icon is /!\ ) as the tool won't start but I can diff using the external tool it when I pass it to resolved (i.e. a normal "modified" file - [...] icon).

0 votes
Terris Linenbach Apr 17, 2018 • edited Apr 18, 2018

What is your operating system? This used to work with the latest SourceTree and Araxis Merge on OSX. It broke for me in the past two weeks - maybe it's a High Sierra issue. I am using Araxis Merge 2018 Pro (2018.4971) for El Capitan or later and SourceTree 2.7.2 (167).

Terris Linenbach Apr 18, 2018

I filed a bug for sourcetree https://jira.atlassian.com/browse/SRCTREE-5607

0 votes
Terris Linenbach Apr 17, 2018

I switched to BeyondCompare.

Suggest an answer

Log in or Sign up to answer
This widget could not be displayed.
This widget could not be displayed.
Community showcase
Posted in Sourcetree

[dev team] Sourcetree for Windows 2019 Preview - Dark Theme

Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going.  The ...

1,891 views 14 18
Join discussion

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