Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Git merge tool that also shows the remote base

Tags:

I used to work with 3-way merge tools like BC3, SourceGear, or P4 which usually show 4 components: base, left, right, and merged result.

What Git seems to do, and rightly so especially in cases of a git rebase --onto seem to be a "4-way merge": left-base, left, right-base, right, merged result. Or in other words, taking the diff patch done on the left (local) side, and trying to merge it with a diff patch done on the right (remote) side.

Merged = Left-Diff-Path + Right-Diff-Path

Would you know any good tool that shows those 4 components if there is any such support nowadays?

like image 986
Wernight Avatar asked Dec 13 '11 14:12

Wernight


1 Answers

I don't think one exists. I've always heard that BC3 and P4Merge were the best ones.

like image 150
Adam Dymitruk Avatar answered Oct 21 '22 09:10

Adam Dymitruk