My PC OS is Windows 10. The external diff tool is P4Merge. Source Tree version 126.96.36.199
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.
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 ?
Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...
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!
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