From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Wed, 18 Jan 2006 19:07:27 GMT
Subject: Re: "tla missing -s" equivalent with git/cogito
Message-ID: <46a038f90601181107h57e6fb73peb199689349aec41@mail.gmail.com>
In-Reply-To: <20060118185542.GT28365@pasky.or.cz>

On 1/19/06, Petr Baudis <pasky@suse.cz> wrote:
> Now you want to merge the branch as a whole. Cherrypicking-aware VCS
> would just merge the patch2, but you are taking the whole diff:
...
> And you get a conflict instead of b\nc.

While I haven't tested your particular example, it looks to me like
git-cherry would identify it correctly. So far my experience has been
that git-cherry's strategy detects my cherry-picked patches pretty
well.

Why would it not work in your example? Patch 1 has clearly been
applied in both branches, and git-cherry would normally detect that
alright.

btw, when is cg-merge switching to use git-merge? :-p



martin