git 重新应用因冲突而取消的提交？
声明：本页面是StackOverFlow热门问题的中英对照翻译，遵循CC BY-SA 4.0协议，如果您需要使用它，必须同样遵循CC BY-SA许可，注明原文地址和作者信息，同时你必须将它归于原作者（不是我）：StackOverFlow
原文地址: http://stackoverflow.com/questions/6807520/
Warning: these are provided under cc-by-sa 4.0 license. You are free to use/share it, But you must attribute it to the original authors (not me):
StackOverFlow
Reapply a commit that was undone by conflict?
提问by Will
I have this commit that was undone by someone who doesn't know how to deal with conflicts. Is there an easy way to try auto merging the commit back in? I tried using "merge to master" but it just says up to date. I am using tortoisegit.
我有一个不知道如何处理冲突的人撤消了这个提交。有没有一种简单的方法可以尝试自动合并提交？我尝试使用“合并到掌握”，但它只是说是最新的。我正在使用 tortoisegit。
回答by svick
That's what git cherry-pickis for. It lets you apply changes by using already existing commits.
这git cherry-pick就是为了。它允许您通过使用现有提交来应用更改。
The basic syntax is:
基本语法是：
git cherry-pick <commit> ...
