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

Re: git-rerere vs rebase --skip

Mike Hommey m...@glandium.org writes: 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,