On Thu, Mar 17, 2011 at 15:10, Jay Soffian <jaysoffian@xxxxxxxxx> wrote: > On Thu, Mar 17, 2011 at 4:53 AM, Alex Riesen <raa.lkml@xxxxxxxxx> wrote: >> What if they just revert the rest? Reset the files to their states before >> merge. > > That's the same as checkout --ours which is sometimes a valid > resolution for a file. So I think "I resolved this file" needs to be > recorded either way. But it is recorded: the file is different now! -- 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