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

74 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 Upvoted: 04 Jun Comments: 6

Comments: 6