6 ms·

Does it support three-way merge? I still use BeyondCompare for this, and it's a killer feature whenever I have to rebase my PR against the latest upstream HEAD.

by drey08 6y ago

Does it support three-way merge? I still use BeyondCompare for this, and it's a killer feature whenever I have to rebase my PR against the latest upstream HEAD. Can't live without it, and I consider it an essential feature for a paid product.

ben-schaaf 6y ago
Yes it does. It gets used for resolving merge conflicts, but it can also be used as a separate tool: https://www.sublimemerge.com/docs/command_line https://www.sublimemerge.com/docs/command_line
hprotagonist 6y ago
I've been using kdiff3 for like 15 years by now: https://sourceforge.net/projects/kdiff3/ https://sourceforge.net/projects/kdiff3/ and still feel most at home there.