Might be too late already, since this is already 8h old and does not have too many answers, but: As for me: A text editor and a text search for `<<<<`. Now as

Might be too late already, since this is already 8h old and does not have too many answers, but: As for me: A text editor and a text search for `<<<<`. Now as for why, and in the hopes that someone here could give me a hint to better existing tooling: I usually run into conflicts with `git rebase`, not `git merge`. And no tool I have available gives me the important information about a conflict when rebasing a longer branch: - What exactly is the conflicting commit I'm currently rebasing? How does its diff look like? - What is the conflicting commit on the target branch? How does its diff look like? Note that those two questions are much more important than the "snapshot 1, snapshot 2, result" view most merge tool provide. A conflict means two commits change the same region of code for reasons, and those reasons matter. It's mostly understanding them that makes the resolution possible, and reconstructing that information can be a huge headache. Anyone know about such history-aware tooling for handling merge conflicts?