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 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 votes
minnsey Atlassian Team Jul 26, 2017

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

4,962 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