Add a 3-way merge UI to ease complicated merges and rebases

71 votes

When rebasing big changes, it is really hard to keep track of what was changed and why.
A 3-way diff is an absolute necessity to properly resolve conflicts. Right now GitKraken UI show only a 2-way merge:

1. Remote
2. Local
+ Output

3-way merge tools (i.e. Kdiff3) add another view of a file, often called a `Base` - i.e. the state from which the branches diverge.

Please add the 3-way merge UI to make resolving conflicts easier.

Under consideration Suggested by: Martin (18 Jun, '21) • Upvoted: 04 Mar • Comments: 6

Comments: 6

16 Nov, '21
dada051
GitKraken supports very old version of KDiff3 (which can be found at kdiff3.sourceforge.net) but not the new ones that can be found here: https://download.kde.org/stable/kdiff3/?C=N;O=D
16 Dec, '21
Veit
GitKrakens merge editor is a kind of a 3-way editor. As long as you don't select a line from Remote or Local the lower view shows the base. But I agree that a dedicated base-view would be great in cases where a merge conflict is more complicated.
1
07 Jun, '22
George Skarpathiotakis
I totally agree. The way we work here and with multiple projects working on the same code there are cases where the Git Kraken doesn't know that there's a conflict. So it would be invaluable to have this feature, and even be able to have the option to force a 3 way merge view in case we want to do the merge manually.
03 Feb, '23
jsonWho
Beyond Compare - https://www.scootersoftware.com/

Probably the best merge tool you can have
03 Aug, '23
richmaes
An option to force the use of a 3-way merge UI even on resolved files would help my team. Working with ASIC/FPGA flows, developers on our team want to see what each merge decision looked like line by line.
02 Mar
David Coleman
I use kdiff3 since forever. because of 3 way merge. It's the only way to merge. Kdiff3 solves 90% of conflicts so i dont' have to. and then the rest are easy enough. The editor is rudimentary but works predictably. i have introduced scores of younger engineers to sourceforge (imagine their amazement to see this relic of the early internet) and kdiff3 and git kraken. i have dozens of my engineers set up with this very combination. Kdiff3 is old. it is incredibly old. and it's perfect. it doesn't need to change. ever. Why should it? But you git kraken are the hands down best git ui i've ever used. certainly you can do a 3 way merge and conflict resolution engine as good as kdiff3 and make it beautiful too! and hey why not throw in an embedded atom conflict editor or something?