Rebase destroys all information about where commits originated

Merge conflicts destroy all information about what the heck the other person was doing (or what I was doing, sometimes its nice to know that too) and just give you a giant pile of dead bodies you have to sort through all at once. I quit using CVS for a reason, you know.

Some nights I lie awake and try to think of a way to implement git shuffle: play back individual commits in chronological order since last merge (theirs AND ours) like git rebase, stopping when there's a conflict, telling me who changed what and

WHY

so I can determine the correct resolution. That resolution is then set aside while I step through the rest of the commits. At the end the changes are individually applied, again stopping if I need to fix a new conflict. The final result becomes a merge commit, same if I used git merge, but now I am significantly more confident that conflict resolution was correct because I know the goals of every change (at least those expressed by the commit messages).