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?
Just to save people from reading all the documentation, you can pretty much just set `rerere.enabled` to true in your .gitconfig, and it'll take care of it all for you.
Jefromi
2010-08-18 23:18:38
In addition to the man pages, the Git maintainer Junio Hamano has a nice blog post about using rerere at http://gitster.livejournal.com/41795.html .
Pat Notz
2010-08-19 04:35:54
if youre merging(pulling), just set rerere.enabled, if rebasing, it seems you have to git rerere before and after editing the conflicting file, manually
2010-08-19 17:56:01
A:
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
Andreas Rehm
2010-08-18 21:45:00