On Mon, Jun 16, 2008 at 01:46:38PM +0930, Geoff Russell <geoffrey.russell@xxxxxxxxx> wrote: > 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.
Attachment:
pgpQRanMBJNCz.pgp
Description: PGP signature
