Ilari Liusvaara <ilari.liusvaara <at> elisanet.fi> writes: > git checkout --theirs -- <file> > git add <file> Thanks you very much.That is what I want! -- 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