![]() ![]() Git config -local "C:/Program Files/Perforce/p4merge. Git config -local "C:/Program Files/Perforce/p4merge.exe" You can manually edit the config file, or you can open up a command line, change directory into the repository and change the default merge and difftool with the following commands. Like most things with git there is more than one way to do it, you can either call git. Setting p4merge up as the mergetool for git is really simple. If you’re using the git-gui, right click on the contents of the merged file, and select use merge tool. However, it can still be that on the repository level there is still a setting that overrides the global settings, this is located in. Using a tool to resolve the conflicts is done with the git mergetool command. Git config -global "C:/Program Files/Perforce/p4merge.exe"Īfter that, whenever git difftool is launched it will start p4merge. Ratio : Experimental - change the aspect ratio from 16:9. ![]() Git config -global "C:/Program Files/Perforce/p4merge.exe" You can use them with x1 Resolution scale to increase GPU performance. ![]() vim ~/.I am assuming that you have P4Merge installed in the default install directory, if not edit the directory accordingly in the commands listed below.Įxecute these commands in the command line to set Git's default mergetool and difftool to P4Merge.Install Git (if you do not have it already).Install P4Merge from Perforce official site for free (if you do not have it already).Amazing! And the very next thing I wanted to do is to write this blog so that people like me – who love perforce but want to move to git – can get benefitted □ Steps to integrateĮnough of talks, here are few simple steps (for Mac) of integrating P4Merge tool with git You can also visit (this is where I got these steps from) Lol it was already there! I followed few simple instructions and in less 2-3 mins I was ready to go. Time to think! I thought why can’t I use perforce merge with Git and googled it as if it was a new idea. The major problem is the default “Github client for desktop” doesn’t solve this problem well (doesn’t solve it at all). But within no time, they ended up in this mess of conflicts. They thought of creating “REST service automation test suite” in Git (it was a new module anyway). Until yesterday when our QE team started struggling about resolving conflicts in Git! Their story was no different than mine. I am better of with Perforce for now.”, and I moved on. Then, I said to myself – “Not now, may be someday I’ll start using Git. I also tried few other visual clients, but it was not even comparable to P4Merge tool provided by Perforce. Bummer! I tried command line options, but it wasn’t a great option for me. I use command line too, but for simple tasks □ ). Initially everything was fine, and problem started only when 3 people started contributing (its good that 3 people started contributing) – because every time I wanted to commit my changes, I used to see conflicts and I had no clue how to resolve conflicts in Git. Installed Git for Desktop (visual client – by now u already know I am a big fan of Visual clients. So, one day I thought let me start using Git, started using it for some hobby projects. But I keep hearing great things about Git. How many of you wanted to start using Git, but then learnt Perforce is much better for me □ specially for resolving conflicts! Did you know that you can use your favourite P4Merge tool with Git – and en-cash the power of Git with the comfort of using P4Merge tool for resolving conflicts! Isn’t that cool? I was totally new to git! I am sure many of us are, since we are used to our favourite P4V ( Perforce Visual Client).
0 Comments
Leave a Reply. |