After a failed merge, I want to undo things. I typically use git reset --hard, and it works like a charm. Others have tried to use git checkout -f, but I have cautioned that git reset --hard is really the way to do it. Is there a difference here, or are they equivalent? Bill - 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