Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

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

P4Merge is not launched from SourceTree for Windows

Hi,

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:

- MyFile.ext.BACKUP.rev.ext

- MyFile.ext.BASE.rev.ext

- MyFile.ext.LOCAL.rev.ext

- MyFile.ext.REMOTE.rev.ext

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.

My Configuration:

- Windows7 64 bits

- SourceTree 1.2.3.0 (was teh same with previous versions)

- P4Merge/NTX64/2013.2/685046

Hope to find some help.

Matthieu

7 answers

1 accepted

0 votes
Answer accepted

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

Thanks.

Glad to hear that Matthieu! If you've got any more concerns/questions then feel free to ask away.

This is broken again in 3.0.17

I don't see a solution for this issue.  I'm currently running the latest version of both p4merge and source tree and p4merge will still not open for the external diff. It just opens winmerge.  Any recommendations?

Make a note of the Command & Arguments settings for p4merge, then change the merge tool to "Custom" and place the Command and Arguments for p4merge in the fields.

I'm having this exact same issue and I'm on the latest version 1.5.2 WIN

Having the exact same problem three months later. c'mon guys! any answer?

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.

Hi Matthieu / David,

Could you open a support ticket on support.atlassian.com? From here the support team will be able to help you out directly.

Thanks in advance

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

5,712 views 4 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