Stack Overflow
Stack Overflow

Questions tagged [p4merge]

Perforce visual merge tool, which allows users to visualize the differences between file versions.

P4Merge is the Perforce visual merge tool.

P4Merge allows users to visualize the differences between file versions. P4Merge uses color coding to simplify the process of resolving conflicts that result from parallel or concurrent development.

  • Text files differences can be highlighted and edited
  • Includes or ignores line ending or whitespace differences
  • Supports Windows (CRLF), Mac (CR), and Unix (LF) line ending conventions
  • Accepts command-line parameters and can be used from non-Peforce applications
  • Displays line numbers when comparing and merging files

P4Merge is available on the downloads page of Perforce at Downloads > Browse by Platform > Download P4Merge.

48 questions
1
vote
3 answers

How to configure my mergetool to not show conflict markers?

I configured git to use SmartSynchronize as the merge tool but when I run git mergetool I still see the conflict markers, like this: (bigger version) I was using P4Merge and saw that it handles these conflict markers, but I really like viewing the…
Roberto
  • 11,557
  • 16
  • 54
  • 68
1
vote
0 answers

GIT merge file contents are incorrect for the file name. (SmartGit/Hg || IntelliJ IDEA) && (P4Merge || KDiff3)

THE PROBLEM In setting up the merge tool to resolve conflicts, the files sent to the merge tool are not correct for the content they contain. I have tried searching Stack Overflow, but have not found an answer. Details I'm new to GIT. In trying to…
nick
  • 11
  • 3
1
vote
1 answer

How to set splitter exactly to half window width in p4merge?

I'm wondering if there is a way to set the splitter in p4merge window exactly to 50% screen width. For instance in Total Commander you can right click on splitter and choose from list but there is nothing like that in p4merge.
Puterdo Borato
  • 388
  • 4
  • 19
1
vote
1 answer

When using an external diff tool for Git, how can I get the full path to be passed to the tool rather than the relative path?

I'm trying to use a shell script and .gitconfig to open up p4merge (on Mac) when diffing files with git. It's almost working, but I get a problem with the relative path on the "right" file (second file) which is passed to p4merge: ~> git diff…
mariachimike
  • 1,303
  • 2
  • 17
  • 22
0
votes
1 answer

How do I select the common base file manually for P4Merge?

I am trying to merge a file. I have the main branch and another branch B that was branched from main. Both branches have changes. The main branch was merged to B at some point; but the merge on B was undid directly afterwards. After some more…
mchl12
  • 329
  • 2
  • 10
0
votes
1 answer

Git Difftool p4merge Unexpected Prompt on Diff

When running git difftool I am being prompted for file diff, even though I have prompt = false in my .gitconfig file. Snippet from .gitconfig [diff] tool = p4mergetool renames = copies mnemonicprefix = true [difftool "p4mergetool"] cmd =…
Jim Fell
  • 13,750
  • 36
  • 127
  • 202
0
votes
1 answer

P4merge as Git Merge tool

I followed the config steps to get P4Merge set as my Git merge tool in Windows. But, unlike when I used Beyond Compare, P4Merge pops up a window asking for the two files to compare when I have merge conflicts. Beyond Compare automatically opened…
Todd
  • 2,829
  • 5
  • 34
  • 56
0
votes
1 answer

Git Difftool problem with qt.qpa.plugin: Could not find the Qt platform plugin "cocoa" in ""

I cannot get 'git difftool' to launch P4merge after installing P4merge on my Mac (mac0S 10.13) via the vendor package from the website (rather than Home brew) and configuring my 'git config --global' file like this: [user] name = (my name) email =…
Dugzilla
  • 11
  • 4
0
votes
1 answer

Why does git mergetool show no conflicts, even though there are conflict markers present in files after a merge?

I’m checked out on feature/my-branch and running git merge dev. The conflict markers added to the file are: <<<<<<< HEAD let foo = "foo" let bar = "bar" ||||||| merged common ancestors let baz = "baz" let bar = "bar" ======= let…
Nicholas Servidio
  • 3
  • 2
0
votes
1 answer

Can you prevent P4Merge from jumping back to the top of the file when editing the workspace file?

I have a long standing issue with P4Merge. When I diff a workspace file with the version in the depot and then proceed to edit the workspace file, within P4Merge, after every edit and save the cursor jumps back to the top of the file. This force me…
Benjamin
  • 539
  • 2
  • 6
  • 16
0
votes
0 answers

P4merge with GIT 2.18.0

I'm trying to make p4merge works with GIT thanks to this little tutorial I don't understand what's wrong because I've tried severals ways to do it but I can't succeed in getting a visual interface with p4merge to see the differences between files…
Romain Rnd
  • 501
  • 1
  • 4
  • 7
0
votes
1 answer

How did I generate all these extra files during git mergetool and how do I get rid of them?

I just setup my new git repo with p4merge setup as my external git mergetool. I'm on Mac and I just followed the git tutorial for external mergetools: https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration I worked through my merge…
Benny
  • 242
  • 1
  • 5
  • 17
0
votes
2 answers

P4MERGE how to see only difference from base and Conflicts Diff

I have a lot of files to merge and looking for some help to fasten the process. Presently I am using a P4MERGE tool.If you look into the image which I have uploaded there are 267 changes which are common changes, 1 conflicts and 7 (6+1) changes…
Ajit
  • 31
  • 6
0
votes
1 answer

P4V: What is the difference between merge down and merge any in perforce streams

What is the difference between merge any and merge down in Perforce P4V?. when I try to create a stream in Perforce I am seeing these two options in Advanced settings/options.
Siva G
  • 3
  • 2
0
votes
1 answer

Perforce Merge won't open a file if directory has latin characteres

It's been a while since I last used P4Merge, but last time I checked, there was no such strange issue. I'm trying to open a file in order to compare it (or merge it) with another file. If I start p4merge.exe, and type a directory like…
Eric Wu
  • 908
  • 12
  • 35
1 2
3
4