It was working in the past, but I'm not sure how long it's been since I needed to merge. I recently updated Mac OS from 10.10.4 to 10.10.5.
I have the latest SourceTree and the latest p4merge. I have p4merge set for both diff and merge in source tree prefs. I've tried it both with p4merge running and not running when I select "launch external merge tool". I have restarted both programs. What else should I try?
As a work around, I manually set the base, #1, and #2 in p4merge, but it is a slow process, also error prone.
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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