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

Sorry, that lacked complete sense:

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 _rebased branch_,
the compensation can be squashed with the compensated commit -
effectively bringing the eventual resolution of the conflict forward in time.

jon.