From: Miklos Vajna <vmiklos@frugalware.org>
Date: Mon, 16 Jun 2008 21:16:38 GMT
Subject: Re: Guided merge with override
Message-ID: <20080616211638.GL29404@genesis.frugalware.org>
In-Reply-To: <48563D6C.8060704@viscovery.net>

On Mon, Jun 16, 2008 at 12:16:12PM +0200, Johannes Sixt <j.sixt@viscovery.net> wrote:
> I don't think that's what Geoff needs. The 'theirs' strategy replaces the
> entire tree by 'their' - B's - tree. But IIUC, only the subset of files
> that are contained in B should be replaced by B's version, the rest of the
> files should remain unchanged. This is quite different from 'theirs' strategy.

Thanks, I missed that difference, and sorry for the wrong suggestion.