How do you fix a bad merge, and replay your good commits onto a fixed merge?
问题 I accidentally committed an unwanted file ( filename.orig while resolving a merge) to my repository several commits ago, without me noticing it until now. I want to completely delete the file from the repository history. Is it possible to rewrite the change history such that filename.orig was never added to the repository in the first place? 回答1: Please don't use this recipe if your situation is not the one described in the question. This recipe is for fixing a bad merge, and replaying your