Time to think! I thought why can’t I use perforce merge with Git and googled it as if it was a new idea. P4Merge presents merge information in 4 panes - BASE, LOCAL, REMOTE and MERGERESULT. 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. Ill just keep a closer eye on alternative macOS Git GUI clients instead. I am better of with Perforce for now.”, and I moved on. SourceTree 4.1.6 macOS 12.2.1 Xcode command line tools installed. 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.
#P4merge git mac how to#
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. The nice thing about this wrapper setup is that you can change your diff and merge tools easily. So, one day I thought let me start using Git, started using it for some hobby projects. If you try to merge two branches and subsequently have merge conflicts, you can run the command git mergetool it starts P4Merge to let you resolve the conflicts through that GUI tool. 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 kommentar(er)
