p4merge error [GIT]

git perforce git-p4 p4merge
JohnIdol picture JohnIdol · May 15, 2009 · Viewed 18.8k times · Source

I am trying to use p4merge with git but I am getting:

Error starting p4merge: "path/myFile" is (or points to) an invalid file (this lists the BASE, LOCAL, REMOTE, and standard version of the file).

Git tells me about the conflict then it asks if I wanna start the mergetool configured (p4merge) and then I get the error above.

Additional note: it happens with any file!

Any clue about what this is and how to fix it?

Answer

Mike Glenn picture Mike Glenn · Aug 2, 2009

This worked for me using msysGit on windows 7:

git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd 'p4merge $BASE $LOCAL $REMOTE $MERGED'

Not sure why but the quoting screwed things up for me.

Related questions

Getting the whole files history with git-p4

As I've mentioned in a previous question, I'm looking into migrating our source control from Perforce to git. Looking around, I've found git-p4 (you have to dig a bit more, since it's not even at the repository pointed by the …

Read More
GIT vs. Perforce- Two VCS will enter... one will leave

So I'm in the process of getting GIT sold at work. First thing I need is to convince everyone that GIT is better at what they're already used to doing. We currently use Perforce. Anybody else go through a similar …

Read More
Perforce for Git users?

There is a lot of "Git for Perforce users" documentation out there, but seemingly very little of the opposite. I have only used Git previously and recently started a job where I have to use Perforce a lot, and find …

Read More