Re: Guided merge with override

From: Miklos Vajna <vmiklos@frugalware.org>
Date: Jun 16, 2008, 09:25 UTC
Message-ID: <20080616092554.GB29404@genesis.frugalware.org>
In-Reply-To: <93c3eada0806152116v2cef4035u272dc1a26005661a@mail.gmail.com>

On Mon, Jun 16, 2008 at 01:46:38PM +0930, Geoff Russell <geoffrey.russell@gmail.com> wrote:

Show 6 quoted lines

> I have a two repositories A and B.  B is a tiny subset of the files in
> A and all have been
> modified.   If I do a "git pull B" into A, I get conflicts. I always
> want to resolve these
> by accepting the version from B. Is there a magic "override" switch to
> let me do this?

There was a thread about this:

http://thread.gmane.org/gmane.comp.version-control.git/84047

and then you can do a git pull -s theirs B.