That sounds like (sounds like at least) a breath of fresh air to be honest. Conflicts are very important to deal with and yet are a second-class concept in Git. And if you primarily use rebase you have to rely on git-rerere. And if you screw up a rebase? I guess you just `git rerere forget` one of those stored files? But what if you forget that it was slightly messed up? Well I guess it might just lie around as an opaque “conflict cache” resolution.
At least I can use `git show --remerge diff` on a merge commit that had a conflict. That gives some after-the-fact insight.
At least I can use `git show --remerge diff` on a merge commit that had a conflict. That gives some after-the-fact insight.