Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > Hi, > > On Wed, 22 Nov 2006, Alan Chandler wrote: > >> 2) Some files get completely munged with conflict resolution markers >> every few lines. Is there a simple way to say "don't use this file, but >> use the [stage2/stage3] sources of the merge". (ie one of the original >> inputs to the merge - and if so, which one is which) > > I find myself using > > git diff --ours <file> > > and > > git diff --theirs <file> > > in such a case sometimes. If I _know_ my version is good, I do > > git diff --ours <file> | git apply -R > > This also updates the index. Good suggestion, but apply does not update the index without being told to do so with --index, so I think the commandline should be: git diff --ours <path> | git apply -R --index - 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