![]() Integrates with version control systems, such as Git, Bazaar, Mercurial, and SVN. Lol it was already there! I followed few simple instructions and in less 2-3 mins I was ready to go. Three-way comparison of files and folders. Time to think! I thought why can’t I use perforce merge with Git and googled it as if it was a new idea. OReilly members experience books, live events, courses curated by job. The major problem is the default “Github client for desktop” doesn’t solve this problem well (doesn’t solve it at all). Get Git Complete now with the OReilly learning platform. 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. I tried many contenders (Araxis, P4Merge and many others). A fully native and elegant Human Interface is for me of paramount importance. 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). I am a Mac user attached to elegance and esthetics as a significant factor in productivity for cognitive reasons.
0 Comments
Leave a Reply. |