git rebase resolve conflicts again and again?

Question

every time i git rebase my patchset on a new version of the original, do i have to manually resolve the conflicts again and again?

Answer 1

Check out git-rerere.