如何在结束命令上的合并冲突导致中断后恢复 Git-Flow？
声明：本页面是StackOverFlow热门问题的中英对照翻译，遵循CC BY-SA 4.0协议，如果您需要使用它，必须同样遵循CC BY-SA许可，注明原文地址和作者信息，同时你必须将它归于原作者（不是我）：StackOverFlow
原文地址: http://stackoverflow.com/questions/14754632/
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
How to resume Git-Flow after a break cause by a merge conflict on a finish command?
提问by JudgeProphet
Do i really need to complete all the step by hand every time I "Finish" a branch and there is a conflict merging it with Git-Flow? Or there's a way to resume after all the conflict are solved?
每次我“完成”一个分支并且将它与 Git-Flow 合并时是否真的需要手动完成所有步骤？还是有办法在所有冲突解决后恢复？
回答by Jonno
After resolving the conflict, you simply call
解决冲突后，您只需调用
git flow release finish [RELEASE_NAME]
again. git is 'smart' in that if you try to do merge from branch A to branch B more than once, the second and subsequent times are ignored with "Already up-to-date" as long as the source of the merge has not changed.
再次。git 是“聪明的”，因为如果您尝试从分支 A 合并到分支 B 不止一次，只要合并的源没有改变，第二次和随后的时间就会被忽略，并显示“已经是最新的” .
