Add a 3-way merge UI to ease complicated merges and rebases
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:
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 • Upvoted: 27 Feb • Comments: 4
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
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.
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.
Beyond Compare - https://www.scootersoftware.com/
Probably the best merge tool you can have