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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
