24

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?

koo5
  • 450
  • 3
  • 9
  • 1
    I don't quite understand the problem here. Once you've rebased and resolved the conflicts, surely you are actually changing your commit to a commit premised on the new version of the original. The next time, you shouldn't have to re-resolve this because you're now applying the updated patch? – Jez Mar 28 '12 at 08:43
  • Does this answer your question? [Why does the same conflict reappear when I use git rebase?](https://stackoverflow.com/questions/31401754/why-does-the-same-conflict-reappear-when-i-use-git-rebase) – ggorlen Feb 11 '22 at 04:06

2 Answers2

21

Check out git-rerere.

Carl Norum
  • 210,715
  • 34
  • 410
  • 462
  • 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. – Cascabel Aug 18 '10 at 23:18
  • 1
    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 Aug 19 '10 at 04:35
  • 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 – koo5 Aug 19 '10 at 17:56
0

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
  • 2,154
  • 14
  • 19