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?
I don't think one exists. I've always heard that BC3 and P4Merge were the best ones.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With