rebase - automatically continue if rerere resolved all conflicts

前端 未结 2 851
佛祖请我去吃肉
佛祖请我去吃肉 2021-02-03 23:26

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

2条回答
  •  心在旅途
    2021-02-03 23:47

    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.

提交回复
热议问题