Re: [RFC v2] Rebasing merges: a jorney to the ultimate solution (Road Clear)

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mar 7, 2018, 06:46 UTC
Message-ID: <nycvar.QRO.7.76.6.1803070742580.20700@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
In-Reply-To: <87r2oxe3o1.fsf@javad.com>

Hi Sergey,

On Tue, 6 Mar 2018, Sergey Organov wrote:

> This is v2 of my "Rebasing merges" proposal.

Didn't we settle on Phillip's "perform successive three-way merges between the original merge commit and the new tips with the old tips as base" strategy? It has the following advantages:

- it is *very simple* to describe

- it is *very easy* to reason about, once it is pointed out that rebases
  and merges result in the same trees.

... and BTW...

> 3. I now use "True Merge" name instead of former "Trivial Merge", to
>    avoid confusion with what Git documentation calls "trivial merge",
>    thanks to Junio C Hamano <gitster@pobox.com> for pointing this out.

"True Merge" is probably also a candidate for improvement. If what you refer to is a "true" merge, that means all others are "untrue" merges???

Ciao, Johannes