blocks|key|1298725|text|让我们假设你有这样的历史|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1298726|---o---o---o---M---W---x-------x-------*
++++++++++++++/++++++++++++++++++++++
++++++---A---B|code-block|syntax|javascript|1298727|其中A、B提交失败，W-是M的还原|1298728|因此，在我开始修复发现的问题之前，我会精挑细选地提交给我的分支|1298729|git+cherry-pick+-x+W|1298730|然后在我的分支上恢复W+commit|1298731|git+revert+W+|1298732|在我可以继续修复之后。|1298733|最终的历史可能如下所示：|1298734|---o---o---o---M---W---x-------x-------*
++++++++++++++/+++++++++++++++++++++++/+++++
++++++---A---B---W---W`----------C---D|1298735|当我发送PR时，它会清楚地显示PR是undo+revert，并添加了一些新的提交。|1298736|entityMap^0|0|0|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|10|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|11|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|12|8|@]|9|@]|A|$]]|$1|I|3|J|5|6|7|13|8|@]|9|@]|A|$]]|$1|K|3|L|5|D|7|14|8|@]|9|@]|A|$E|F]]|$1|M|3|N|5|6|7|15|8|@]|9|@]|A|$]]|$1|O|3|P|5|D|7|16|8|@]|9|@]|A|$E|F]]|$1|Q|3|R|5|6|7|17|8|@]|9|@]|A|$]]|$1|S|3|T|5|6|7|18|8|@]|9|@]|A|$]]|$1|U|3|V|5|D|7|19|8|@]|9|@]|A|$E|F]]|$1|W|3|X|5|6|7|1A|8|@]|9|@]|A|$]]|$1|Y|3|-4|5|6|7|1B|8|@]|9|@]|A|$]]]|Z|$]]

Let's assume you have such history 

<pre><code>---o---o---o---M---W---x-------x-------*
 / 
 ---A---B
</code></pre>

Where A, B failed commits and W - is revert of M

So before I start fixing found problems I do cherry-pick of W commit to my branch

<pre><code>git cherry-pick -x W
</code></pre>

Then I revert W commit on my branch

<pre><code>git revert W 
</code></pre>

After I can continue fixing. 

The final history could look like:

<pre><code>---o---o---o---M---W---x-------x-------*
 / / 
 ---A---B---W---W`----------C---D
</code></pre>

When I send a PR it will clearly shows that PR is undo revert and adds some new commits.

blocks|key|1298778|text|我是在面对同样的问题时才发现这篇文章的。我发现上面做重置硬盘等操作很可怕。我最终会删除一些我不想要的东西，并且无法找回它。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1298779|取而代之的是，我签出了我希望分支返回的提交，例如git+checkout+123466t7632723。然后转换为分支git+checkout+my-new-branch。然后我删除了我不想要的分支。当然，这只有在你能够扔掉你弄乱的分支的情况下才能起作用。|offset|length|style|CODE|1298780|entityMap^0|0|O|R|1N|Q|0^^$0|@$1|2|3|4|5|6|7|J|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|K|8|@$D|L|E|M|F|G]|$D|N|E|O|F|G]]|9|@]|A|$]]|$1|H|3|-4|5|6|7|P|8|@]|9|@]|A|$]]]|I|$]]

I just found this post when facing the same problem. I find above wayyy to scary to do reset hards etc. I'll end up deleting something I don't want to, and won't be able to get it back. 

Instead I checked out the commit I wanted the branch to go back to e.g. <code>git checkout 123466t7632723</code>. Then converted to a branch <code>git checkout my-new-branch</code>. I then deleted the branch I didn't want any more. Of course this will only work if you are able to throw away the branch you messed up.

blocks|key|1513551|text|要在GIT中还原还原，请执行以下操作：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1513552|git+revert+<commit-hash-of-previous-revert>|code-block|syntax|javascript|1513553|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

To revert a revert in GIT:

<pre><code>git revert &lt;commit-hash-of-previous-revert&gt;
</code></pre>

blocks|key|1513596|text|我建议你按照下面的步骤来恢复，比如SHA1。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1513597|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|code-block|syntax|javascript|1513598|现在为分支users/yourname/revertOfSHA1创建PR|offset|length|style|CODE|1513599|entityMap^0|0|0|5|R|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Q|8|@$I|R|J|S|K|L]]|9|@]|A|$]]|$1|M|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|N|$]]

I would suggest you to follow below steps to revert a revert, say SHA1. 

<pre><code>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
</code></pre>

Now create PR for the branch <code>users/yourname/revertOfSHA1</code>

I have run into a bit of a problem here: I had a problem-specific branch <code>28s</code> in Git, that I merged in the general <code>develop</code> branch. Turns out I had done it too fast, so I used git-revert to undo the merge. Now, however, the time has come to merge <code>28s</code> into <code>develop</code>, but git-merge command sees the original merge, and happily announces that all is well and branches have been already merged. What do I do now? Create a 'Revert "Revert "28s -> develop"" ' commit? Doesn't seem to be a good way to do it, but I can't imagine any other at the moment.

What the tree structure looks like:

<img src="https://imgur.com/uhvLD.png" alt="Git log output">

Re-doing a reverted merge in Git

我在这里遇到了一个小问题:我在Git中有一个特定于问题的分支28s，我将它合并到了通用的develop分支中。事实证明我做得太快了，所以我使用git-revert来撤销合并。然而，现在到了将28s合并到develop中的时候了，但是git-merge命令看到了原始的merge，并愉快地宣布一切都很好，分支已经合并。我现...

问在Git中重新执行恢复的合并
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问在Git中重新执行恢复的合并EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问在Git中重新执行恢复的合并
EN