Am 6/15/2010 1:04, schrieb Jay Soffian: > Subject says it all, but I'll elaborate. > > During the course of testing a merge, I'll sometimes realize there was > a mistake and I'll amend the merge commit. Sadly this doesn't update > the rerere cache. There is git rerere forget that/conflicted/file It definitely works as long as the conflict is still recorded in the index; I'm not sure if it works after you have staged the updated resolution. -- Hannes -- 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