你必须“还原还原”。取决于你是如何还原原始文件的，它可能不像听起来那么容易。看看关于这个话题的官方文件。

---o---o---o---M---x---x---W---x---Y
              /
      ---A---B-------------------C---D

允许:

---o---o---o---M---x---x-------x-------*
              /                       /
      ---A---B-------------------C---D

But does it all work? Sure it does. You can revert a merge, and from a purely technical angle, git did it very naturally and had no real troubles. It just considered it a change from "state before merge" to "state after merge", and that was it. Nothing complicated, nothing odd, nothing really dangerous. Git will do it without even thinking about it. So from a technical angle, there's nothing wrong with reverting a merge, but from a workflow angle it's something that you generally should try to avoid. If at all possible, for example, if you find a problem that got merged into the main tree, rather than revert the merge, try really hard to: bisect the problem down into the branch you merged, and just fix it, or try to revert the individual commit that caused it. Yes, it's more complex, and no, it's not always going to work (sometimes the answer is: "oops, I really shouldn't have merged it, because it wasn't ready yet, and I really need to undo all of the merge"). So then you really should revert the merge, but when you want to re-do the merge, you now need to do it by reverting the revert.

要在GIT中恢复一个恢复:

git revert <commit-hash-of-previous-revert>

让我们假设你有这样的历史

---o---o---o---M---W---x-------x-------*
              /                      
      ---A---B

哪里A, B失败的提交和W -是恢复M

所以在我开始修复发现的问题之前，我选择W提交到我的分支

git cherry-pick -x W

然后在我的分支上恢复W提交

git revert W 

之后我可以继续修理。

最终的历史记录如下:

---o---o---o---M---W---x-------x-------*
              /                       /     
      ---A---B---W---W`----------C---D

当我发送一个PR时，它会清楚地显示PR是撤销恢复，并添加一些新的提交。

要在不破坏工作流程的情况下还原还原:

创建一个develop的本地垃圾副本 在develop的本地副本上恢复恢复提交 将该副本合并到您的特性分支中，并将您的特性分支推到您的git服务器。

当你准备好了，你的特征分支现在应该可以正常合并了。唯一的缺点是在历史记录中会有一些额外的合并/恢复提交。

我建议您按照以下步骤恢复一个恢复，比如SHA1。

git checkout develop #go to develop branch
git pull             #get the latest from remote/develop branch
git branch users/yourname/revertOfSHA1 #having HEAD referring to develop
git checkout users/yourname/revertOfSHA1 #checkout the newly created branch
git log --oneline --graph --decorate #find the SHA of the revert in the history, say SHA1
git revert SHA1
git push --set-upstream origin users/yourname/revertOfSHA1 #push the changes to remote

现在为分支用户/yourname/revertOfSHA1创建PR

在最初的合并之前在提交时创建新的分支-称其为' development -base' 在' development -base'之上执行'develop'的交互式重基(即使它已经在顶部)。在交互重基期间，你将有机会删除合并提交和反转合并的提交，即从git历史中删除这两个事件

此时你将拥有一个干净的“开发”分支，你可以像往常一样将你的功能分支合并到其中。