Behind enemy lines: 3 months as an iOS developer at Google

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.

[ Parent | on HN ]

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>?

[ Parent | on HN ]

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

[ Parent | on HN ]

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.

[ Parent | on HN ]