3 ms·
1 and 2 can be handled by meld[1], available both on Linux and on OSX (via brew). It integrates with git with just `git mergetool -t meld`. 1: http://meldme
by nine_k 11y ago
1 and 2 can be handled by meld[1], available both on Linux and on OSX (via brew).
It integrates with git with just `git mergetool -t meld`.
1: http://meldmerge.org/
- js2 11y agoIn particular, you really want a 3-way merge tool (which compares yours and theirs to the common ancestor) for resolving conflicts. Meld didn't used to have this, but it looks like it does now. FWIW, on OS X you can also configure git to use opendiff (which opens FileMerge). It does the job pretty well. Source: my day job used to involve daily merging of Chromium with Rockmelt and I probably evaluated every merge tool that existed at the time. Tip: git config --global merge.conflictstyle=diff3
- grincho 11y agoA little off-topic: since 10.10 or so, FileMerge has started opening the bottom, free-editing pane by default—and at a random height, at that. Has anyone figured out how to disable that? It's driving me into the arms of a different, otherwise inferior diff tool.
- duaneb 11y agoSure. I use kaleidoscope (or vimdiff if necessary). It's a little confusing to see git clients completely neglect this, though—how much time do you really use looking at pretty commit graphs as opposed to actually working with code?