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 p4-git (you have to dig a bit more, since it's not even at the repository pointed by the link. The actual p4-git script harder to find). I'm now running this script, and it imports the current versio...
I'm cloning a repo that was first generated by git-p4. git-p4 uses a 'remotes/p4/master' branch that I would like to track. How do I tell git, which is cloning that repo, to track remotes/p4/master as well? That way I would be able to check out "origin/remotes/p4/master" or something. ...
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. Addition...
I have a laptop and a desktop, for which I'm trying to learn to use git to manage my work against a perforce repository. I'm using git-p4 successfully on the desktop, and can use it successfully on the laptop as well, in isolation. However, one of the things I'd like to be able to do is to "pull" or "push" changes from the laptop to de...