Re: [Rails-devel] Branches - oops...

[John A. T. <ja...@ja...>]

On Mon, Mar 17, 2014 at 1:13 PM, Stefan Frey <ste...@we...> wrote:

> Mike:
> OK now I understand. It seems that you at least did an forced update to
> rails_1.7.12_1880 if something that was already merged with rails2.0.
>
> Do you already know how to got it reverted? Otherwise I will have a look
> later tonight or maybe Brett has a good proposal?
>

Basically, go back to the SHA before the force-push, force-push that to
origin/master, and then replay the changes you want on top of that (using
only fast-forward merges).  Make sure you have the changes you want named
by some branch, or else they will be unreachable after you do that.

-- 
John A. Tamplin