I do not understand why p4merge is not launching when I select "Resolve Conflict/Launch External Merge Tool".
If I setup p4merge in the options the te configuration seems ok.
My .gitconfig is modified by Sourcetree with
[difftool "sourcetree"] cmd = 'D:/dev/tools/diff/WinMerge/WinMergeU.exe' \"$LOCAL\" \"$REMOTE\" [mergetool "sourcetree"] cmd = 'D:/dev/tools/diff/P4Merge/p4merge.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\" trustExitCode = true
My SourceTree userconfig file contains:
<setting name="MergeTool" serializeAs="String"> <value>2</value> </setting>
BUT if I stop SourceTree & relaunch it, the merge configuration gets lost and is set again to "System Default" !!!
Even when I configure it in a running session (without restarting it), what Sourcetree does is that it creates 4 files:
and stays with a popup "Visual Merge in progress".
If from a CMD window and launch p4merge.exe with the correct arguments, it is launched correctly and works as expected.
Is there any option to activate some logging or traces to understand what is occuring.
Even if I look at the Windows Task Manager I never see any p4merge.exe process being launched or try to be launched.
- Windows7 64 bits
- SourceTree 220.127.116.11 (was teh same with previous versions)
Hope to find some help.
Hello Kieran & David,
just receiving the notification of your post, I was preparing myself to open a JIRA ticket but saw an update was there for SourceTree. I installed it (version 18.104.22.168) and restested with a blank fresh new local repo in which I pushed a text file modified in branch and merged back again (with conflict of course). P4Merge has been launched correctly now.
So from my side the problem of launching P4Merge is not there anymore in this version.
Finally got it to work, but I was running lastest version. I noticed that if I did resolve a conflict manually (mark as resolved) it would start to launch p4. but was not just p4, was any external merge tool that was being blocked (tried with tortoise and beyond compare). Maybe there is a underlying bug with the switch of external merge tools that's causing this problems.
Everything below is tested on Ubuntu 17.10. I prefer to use Jira in a docker container because: 1. I can install Jira with a couple of commands. 2. I can start and stop Jira just by starting and s...
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
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot