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.

Answer 2

Depending on your repository you might be able to use the stash

git stash pop
git stash

http://gitready.com/beginner/2009/01/10/stashing-your-changes.html