"Tim Visher" <tim.visher@xxxxxxxxx> writes: > On Mon, Dec 22, 2008 at 4:11 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > >> Do you mean during a conflicted merge resolution you would want to check >> their version out of the index and declare that it is the merge result? > > Sure. That sounds like "git checkout --theirs"... -- 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
