From: Jay Soffian <jaysoffian@gmail.com>
Date: Fri, 19 Dec 2008 04:18:56 GMT
Subject: Re: Odd merge behaviour involving reverts
Message-ID: <76718490812182018x37e3d6fob8d817c0e0b0e293@mail.gmail.com>
In-Reply-To: <alpine.LFD.2.00.0812181949450.14014@localhost.localdomain>

On Thu, Dec 18, 2008 at 11:01 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> Yes, it's more complex, and no, it's not always going to work (sometimes
> the answer is: "oops, I really shouldn't have merged it, because it wasn't
> ready yet, and I really need to undo _all_ of the merge"). So then you
> really should revert the merge, but when you want to re-do the merge, you
> now need to do it by reverting the revert.

Instead of reverting the revert, why not rebase the branch which was
merged to the point after the revert was done?

j.