From: Geoff Russell <geoffrey.russell@gmail.com>
Date: Mon, 16 Jun 2008 04:16:38 GMT
Subject: Guided merge with override
Message-ID: <93c3eada0806152116v2cef4035u272dc1a26005661a@mail.gmail.com>

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?

Cheers,
Geoff Russell