External diff tool P4Merge not working in SourceTree

My PC OS is Windows 10. The external diff tool is P4Merge. Source Tree version 2.1.2.5

 

In Source Tree, when there is merge conflict, I launch the external diff tool P4Merge. In the P4Merge I resolved the conflict, click save and close the P4Merge. It is suppose that the conflict in the source tree disappear, however it is not. The conflict file still in the 'unstaged file" window. What is the problem and how to get around it? Thanks.

1 answer

0 vote

Hi

SourceTree relies on the return code from the merge tool, p4merge in yoru case to determine if the conflicts have been resolved, it is possible something has changed between SourceTree or p4

Can you raise a ticket for this at https://jira.atlassian.com including detals of the p4 version ?

 

Thanks

Suggest an answer

Log in or Join to answer
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 ...

270 views 0 3
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
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot