git-rerere vs rebase --skip

Hi,

In one of my workflows, I constantly rebase topic branches on top of new upstream imports. As there are several upstream import branches, I have similar topic branches on top of different imports. When rebasing the topic branches, I can hit conflict resolution that I already had to do for other topic branches on another upstream import branch. Here, git rerere is very helpful. But sometimes, the conflict resolution is just to skip the patch, because it was incorporated upstream in a way that git doesn't detect, or it was obsoleted, or whatever. In such cases, git rerere is not being helpful because it doesn't store any information about that, and I have to check again if that's an actual conflict to solve or a patch to skip again.

It would be helpful if there was a rebase --skip mode that would tell rerere to record that the resolution *is* --skip.

Mike