rebase - 如果rerere解决了所有冲突，将自动继续 [英] rebase - automatically continue if rerere resolved all conflicts

问题描述

Git rerere 规定在重新绑定期间重新使用先前的冲突解决方案，以及甚至可以通过设置 rerere.autoupdate = True 来分阶段解析文件（详见另一个问题）。然而，即使所有的冲突都解决了，并且所有的文件都进入了舞台，我仍然需要运行 git rebase --continue 继续进行rebase操作。

Git rerere provides for reuse of previous conflict resolutions during rebase, and can even stage the resolved files by setting rerere.autoupdate = True (as detailed in another question). However, even if all conflicts are resolved and all files staged, I still have to run git rebase --continue to continue the rebase operation.

如果 rerere 已解决所有冲突并执行所有更改，我该如何自动继续？

How can I automatically continue if rerere has resolved all conflicts and staged all changes?

推荐答案

没有。冲突发生时，重新合并或合并不会自动提供自动落实的规定。您可以在合并中了解更多关于git merge 此处的信息'标题。 git config 在重新绑定时也不提供自动提交选项。请注意，您可以在合并时选择不提交。

No. Rebase or Merge does not automatically provide a provision for auto-commits when conflicts arise. You could understand more about git merge here in 'merging' heading. git config also does not provide an option for auto commits while rebasing. Note that you could choose not-to commit while merging.

这篇关于rebase - 如果rerere解决了所有冲突，将自动继续的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！