This is one reason I enjoy doing rebases more than merges - you apply one change at a time, and so get to see the history for at least one of the sides.
One thing that always hits me during rebasing is trying to figure out which side is which. Somehow it feels like sometimes they switch, though I'm sure that doesn't make sense.
I usually can keep it straight by thinking, which branch would Linus think is his? That’s ‘ours’, and the new, potentially code-breaking branch is ‘theirs’.
The sense is sort of reversed between rebase and merge. When rebasing, the branch you're rebasing onto is considered the canonical/local branch, despite not being the current branch when you issued "git rebase".
I definitely get lost in big rebases too, same experience. I look at two sides of a merge and even with 3-way turned on I still question which version is the one I want, obviously the point of conflict resolution is to keep the important bits of both sides but I still feel like it takes forever to do it
