4 ms·

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: an

by nodata 14y ago

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?

benvd 14y ago
P4Merge, I would guess. (http://www.perforce.com/perforce/products/merge.html http://www.perforce.com/perforce/products/merge.html)
- djmdjm 14y ago
  I much prefer Meld (http://meldmerge.org/ http://meldmerge.org/) when I want a graphical tool, but usually just edit the conflicts in vim.
  - nodata 14y ago
    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>?
    - m0shen 14y ago
      Yank the two parts into two new buffers (:vsplit) and do :diffthis in each
  - benvd 14y ago
    I've actually never used a visual diff tool. Usually I just search the file for ">>>>>>>>>". Maybe I should check it out.
- josteink 14y ago
  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.
  - to3m 14y ago
    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.
  - chiph 14y ago
    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)
Colliwinks 14y ago
Sounds like p4merge.
flyosity 14y ago
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.

by nodata 14y ago

benvd 14y ago

P4Merge, I would guess. (http://www.perforce.com/perforce/products/merge.html http://www.perforce.com/perforce/products/merge.html)

djmdjm 14y ago
I much prefer Meld (http://meldmerge.org/ http://meldmerge.org/) when I want a graphical tool, but usually just edit the conflicts in vim.
- nodata 14y ago
  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>?
  - m0shen 14y ago
    Yank the two parts into two new buffers (:vsplit) and do :diffthis in each
- benvd 14y ago
  I've actually never used a visual diff tool. Usually I just search the file for ">>>>>>>>>". Maybe I should check it out.
josteink 14y ago
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.
- to3m 14y ago
  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.
- chiph 14y ago
  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)

Colliwinks 14y ago

Sounds like p4merge.

flyosity 14y ago

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.