Re: rebasing inside staging

[David Kastrup]

Graham Percival <address@hidden> writes:

> On Tue, Nov 29, 2011 at 03:41:25AM +0100, David Kastrup wrote:
>> Graham Percival <address@hidden> writes:
>> 
>> > 2) remove that commit, then rebase origin/staging on the result.
>> >
>> > I'm not comfortable rewriting history on a shared repository.
>> 
>> I'll do the second one.  Rewriting history is easy, and that is what
>> staging is for.
>
> Excellent!

The rebase causes merge conflicts later.  So I'll just back out the
whole sequence of commits related to jazz chords.  I think that will
cause fewer headaches to Adam.

If people have feature branches already based off a diverged local
version of staging, they might want to do

git fetch
git rebase --onto origin/staging staging feature-branch
[repeat for every feature branch]
git branch -f staging origin/staging
[now staging is reset to origin/staging]

in order to get rid of the old commits.  

-- 
David Kastrup