From: Miklos Vajna <vmiklos@frugalware.org>
Date: Fri, 06 Jun 2008 14:14:58 GMT
Subject: Re: [PATCH] provide a new "theirs" strategy, useful for rebase --onto
Message-ID: <20080606141458.GQ29404@genesis.frugalware.org>
In-Reply-To: <E1K4a1Q-0002hq-QE@fencepost.gnu.org>

On Fri, Jun 06, 2008 at 12:59:30PM +0200, Paolo Bonzini <bonzini@gnu.org> wrote:
> The new strategy resolves only two heads, and the result of the merge
> is always the second head.  It can be useful with `rebase --onto`,
> because it always resolves conflicts in favor of the commits
> being applied.

Just wanted to say I like the idea. :-)