From: Jon Seymour <jon.seymour@gmail.com>
Date: Wed, 04 Apr 2012 23:05:16 GMT
Subject: Re: rebase -p loses amended changes
Message-ID: <CAH3AnrphGmrZSxALP3j3ADt6Cg4Tr2O83mcDBU2LfUdpdtUCUw@mail.gmail.com>
In-Reply-To: <7vlimb6r37.fsf@alter.siamese.dyndns.org>

On Thu, Apr 5, 2012 at 8:59 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Jon Seymour <jon.seymour@gmail.com> writes:
>
>> Are there any flaws, I wonder?
>
> It all depends on how close the base is to M^1.  The difference might make
> it unnecessary (or even more necessary) to do any evil merge.

True. I guess it is still true there are no perfect solutions in this
area. This does seem like a step in a better direction, though.

jon.