CODEWITHSUNDEEP
git
koo5
koo5

Reputation: 485

git rebase resolve conflicts again and again?

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?

Upvotes: 26

Views: 5478

Answers (2)

Carl Norum
Carl Norum

Reputation: 224864

Check out git-rerere.

Upvotes: 22

Andreas Rehm
Andreas Rehm

Reputation: 2232

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

Upvotes: -1

Related Questions