On Mon, Dec 22, 2008 at 5:52 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > That sounds like "git checkout --theirs"... I'm sorry, Junio. I don't mean to be dense but I can't find that in the docs and when I execute it it comes back as an unknown command. Perhaps you could just point me to the relevant man page? This seems like such a fundamental operation, I just don't understand why there isn't something like a `git resolve`. Thanks for your help! -- In Christ, Timmy V. http://burningones.com/ http://five.sentenc.es/ - Spend less time on e-mail -- 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
