From: Jon Seymour <jon.seymour@gmail.com>
Date: Sat, 31 Mar 2012 05:55:22 GMT
Subject: Re: rebase -p loses amended changes
Message-ID: <CAH3Anrqorf481jw6GdHqOPg9WC0rD-OraOHZ7twWRF4+oJ9X4A@mail.gmail.com>
In-Reply-To: <592E2EEC-6CBA-48D6-8D44-34A971DD78EC@gmail.com>

| My apologies to Thomas and Robert who also received my previous
attempts to send this to this list which were foiled by my iPad's
instance on sending HTML(via two different clients) and the mailing
list's (quite understandable) refusal to accept it.

On Sat, Mar 31, 2012 at 9:49 AM, Thomas Rast <trast@student.ethz.ch> wrote:
> J Robert Ray <jrobertray@gmail.com> writes:
>
>> If a merge is amended to add changes to a file unaffected by the
>> merge, these changes are lost after a rebase. Attached is a script to
>> demonstrate the problem.
> ...


>
> That's pretty much expected. rebase -p attempts to (conflicts will
> happen again) replay the merge.  I don't think anybody's come up with a
> clear idea of how to apply the conflicted or evil parts of the merge
> mechanically.
>

I wonder if there are any really good justifications for changing the
content, as distinct from the comments of a merge during an amendment?

If not, perhaps git could be a little bit noisy about the circumstance
at the point of the --amend commit?

jon.