From: Samuel Tardieu <sam@rfc1149.net>
Date: Tue, 23 Sep 2008 07:30:47 GMT
Subject: Re: rebasing merges
Message-ID: <2008-09-23-09-30-47+trackit+sam@rfc1149.net>
In-Reply-To: <48D88813.9060400@viscovery.net>

>>>>> "Johannes" == Johannes Sixt <j.sixt@viscovery.net> writes:

Johannes> i.e. linearized history without merges.

A few days ago, I had a question in my team quite similar to Stephen
concern. A developer had performed a merge of a complex feature and
was ready to commit it

  --o--o--o--o--X        <-- origin
     \           \
      A--B--C--D--E      <-- master

when he realized that someone just pushed another change on origin
while he was doing the complicating merge (with lots of conflicts to
resolve). The configuration was then:

  --o--o--o--o--X--Y     <-- origin
     \           \
      A--B--C--D--E      <-- master

He would have wanted to have the merge rebased on E and Y instead of E
and X before pushing, without going through all the conflicts
resolution again (he didn't have "rerere" enabled).

Is that possible with "git rebase"?

Btw, would it be a good idea to unconditionally enable "rerere"
conflict resolution *recording*, and add an option to "rebase" and
"merge" to use "rerere" even when it is not enabled in the
configuration file? I can't think of any drawback.

  Sam
-- 
Samuel Tardieu -- sam@rfc1149.net -- http://www.rfc1149.net/