Re: Need some help with git rebase
- From
Sylvain Rabot <sylvain@abstraction.fr>
- Date
- Dec 30, 2009, 22:24 UTC
- Message-ID
- <1262211866.7068.1.camel@kheops>
- In-Reply-To
- <4B38B3A7.6010900@steek.com>
So,
I tried again "git rebase --onto 12.72.1 master feature".
Situation :
a--a--a--a--a--a--a--a--a feature
/
--x--x--x--x--x--x--x--x--x--x--x--x master
\
o--o--o--o--o--o--o 12.72.1Work flow :
$ git checkout 12.72.1 $ git rebase --onto 12.72.1 master feature
a lot of conflicts, resolving and git rebase --continue
And then, at the end of the rebase, without me doing anything, feature branch is checked out and it seems that its HEAD has been reset to the new 12.72.1 HEAD.
--x--x--x--x--x--x--x--x--x--x--x--x master
\
o--o--o--o--o--o--o--a--a--a--a--a--a--a--a--a 12.72.1 featureIs that normal ? If it is, how do I do to avoid my feature branch to be reset at 12.72.1's HEAD ?
Any enlightenment is very welcome.
Regards.
-- Sylvain Rabot <sylvain@abstraction.fr>