From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Fri, 11 Mar 2011 15:50:50 GMT
Subject: Re: Correcting forgetting to make a new branch
Message-ID: <vpqk4g57j1h.fsf@bauges.imag.fr>
In-Reply-To: <op.vr6rgcqs56e9f9@xman.eng.oslo.osa>

"Alexey Feldgendler" <alexeyf@opera.com> writes:

> However, the branch that was active before when you should have
> branched will have been unintentionally updated. To fix that, you'll
> need to move the old branch a few commits back:
>
> git branch -f <old-branch> <where-it-was-before>

This is correct, but for completeness: don't do that if you've already
pushed your changes. If you pushed them and people already pulled them,
you can hardly do better than appologize to your co-workers that you
shouldn't have done that, and possibly create a new commit on top of the
branch reverting what you did.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/