News for hackers. Stuff that matters.
Re:Behind enemy lines: 3 months as an iOS developer at Google by nodata on Thursday January 03, 2013 @06:42AM (#5001922)
Luckily, perforce has a fantastic graphical merge tool, which i’ve now adapted into my post-Google Git tooling.

Anyknow know what he is referring to?

Edit: anyone know what Git tool he is referring to?

Re:Behind enemy lines: 3 months as an iOS developer at Google by benvd on Thursday January 03, 2013 @06:50AM (#5001942)
Re:Behind enemy lines: 3 months as an iOS developer at Google by djmdjm on Thursday January 03, 2013 @07:39AM (#5002061)
I much prefer Meld (http://meldmerge.org/) when I want a graphical tool, but usually just edit the conflicts in vim.
Re:Behind enemy lines: 3 months as an iOS developer at Google by nodata on Thursday January 03, 2013 @08:06AM (#5002143)
Out of interest, do you have a good way to compare two parts of the same file using vimdiff without creating two files? Say a huge xml file with two nearly identical <parts></parts>?
Re:Behind enemy lines: 3 months as an iOS developer at Google by m0shen on Thursday January 03, 2013 @09:49AM (#5002542)
Yank the two parts into two new buffers (:vsplit) and do :diffthis in each
Re:Behind enemy lines: 3 months as an iOS developer at Google by benvd on Thursday January 03, 2013 @08:31AM (#5002230)
I've actually never used a visual diff tool. Usually I just search the file for ">>>>>>>>>".

Maybe I should check it out.

Re:Behind enemy lines: 3 months as an iOS developer at Google by josteink on Thursday January 03, 2013 @08:22AM (#5002190)
As someone who moved from perforce to VS/TFS2010 at work, the first thing everyone at the office demanded back was p4merge. It's a very good tool.

Fortunately, with VS2012 the built in merge-tools has become much better and allows you to do inline editing in the basic compare/merge-view as well. Since VS2012, I can't say I don't miss p4merge, but I miss it a lot less.

Re:Behind enemy lines: 3 months as an iOS developer at Google by to3m on Thursday January 03, 2013 @08:57AM (#5002333)
If you are into this stuff, Araxis Merge is also worthy of consideration. It does a better job of char-by-char diffs than p4merge, and will recalculate the diffs after you manually edit the result.

The (old-ish) version I used had only 3 panes, though, making p4merge superior for 3-way merges. p4merge was easier to use from the keyboard, too. But for ordinary merges, I much preferred Araxis.

Re:Behind enemy lines: 3 months as an iOS developer at Google by chiph on Thursday January 03, 2013 @12:09PM (#5003306)
I've been happy with BeyondCompare. Reasonably priced, does 3-way merges, configurable with many version control systems. Now with Linux & Windows versions (but not a OS X version yet)
Re:Behind enemy lines: 3 months as an iOS developer at Google by flyosity on Thursday January 03, 2013 @01:35PM (#5003777)
I feel like only someone who's never used other graphical merge tools would call Perforce's merge tool "fantastic". It works nearly the same as every other graphical merge tool I've used. Hell, it works almost exactly the same as Filemerge, the hidden utility app that is installed when you install Xcode.
Re:Behind enemy lines: 3 months as an iOS developer at Google by Colliwinks on Thursday January 03, 2013 @06:52AM (#5001945)
Sounds like p4merge.