Re: unexpected git-cherry-pick conflict

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jul 7, 2007, 20:58 UTC
Message-ID: <Pine.LNX.4.64.0707071949440.4093@racer.site>
In-Reply-To: <20070625071819.8091.qmail@5e4088a43a10fd.315fe32.mid.smarden.org>

Hi,

On Mon, 25 Jun 2007, Gerrit Pape wrote:

> Hi, did you get to this yet?, not to stress you, just to make sure we 
> don't forget about it.

Okay. Since now both you and Junio asked for it, and I made today a Git day for me, I looked into this.

I'm not yet done, but preliminary results are:

- cherry-pick calls merge-recursive, which in turn calls unpack_trees(), 
  which in turn gives the ball to threeway_merge. But for d/f conflicts, 
  it goes wrong.

- Documentation/technical/trivial-merge.txt is maybe about a trivial 
  merge. But the document is not trivial in and of itself.

I'll keep going, Dscho