2 ms·
In 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 thi
by js2 11y ago
In 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.