Menu
I'm a fan of the 4-pane approach to 3-way file merging. In particular, being able to see Branch A, Branch B, and the ancestor of A and B in 3 read-only panes, then a 4th read-write pane which shows the results of your merge.
However, I've been unable to find a 4-pane merge tool for Mac OSX that I can integrate with mercurial/git. Does such a beast exist?
251
Use git mergetool to run one of several merge utilities to resolve merge conflicts. It is typically run after git merge. If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file (skipping those without conflicts).
You could use opendiff . It is a command line tool which opens the GUI of FileMerge. For more details type: git help config and search with / for the different options. UPDATE: In recent versions of XCode, FileMerge is now bundled with XCode.
3-way merges use a dedicated commit to tie together the two histories. The nomenclature comes from the fact that Git uses three commits to generate the merge commit: the two branch tips and their common ancestor.
My first thought was to suggest KDiff3, since it does have 4 panes for 3-way merges and can be integrated with git (see here and here), but from the comments you seem to not consider it an option. I am a bit curios why, because I like KDiff3 a lot and it fits my needs.
80
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
