From: Jon Seymour <jon.seymour@gmail.com>
Date: Sun, 21 Feb 2010 23:04:29 GMT
Subject: Re: RFD: best way to automatically rewrite a git DAG as a linear history?
Message-ID: <2cfc40321002211504o28069d16h4b9d1ef2230d03fe@mail.gmail.com>
In-Reply-To: <32541b131002191905u59a90866he0a38dfc661d45d2@mail.gmail.com>

On Sat, Feb 20, 2010 at 2:05 PM, Avery Pennarun <apenwarr@gmail.com> wrote:
> On Fri, Feb 19, 2010 at 9:25 PM, Jon Seymour <jon.seymour@gmail.com> wrote:
>> (A hammer is, of course, a reasonably good tool for making things flat
>> although it does tend to break things along the way).
>
> Nice analogy.  Well, thanks for the clarification and best of luck in
> your slightly crazy project :)
>

Thank you - FWIW, it is shaping up very well. In turns out that in
cases where the original merge was resolved in favour of the conflict,
the compensation can be squashed with the compensated commit -
effectively bring the eventual resolution forward in time.

This is so, so cool.

jon.