Why `git rebase -p` does not preserve conflict resolutions?

后端 未结 1 1691
生来不讨喜
生来不讨喜 2021-01-14 05:03

Has the man page states about git rebase --preserve:

Merge conflict resolutions or manual amendments to merge commits are not preserved.<

相关标签:
1条回答
  • 2021-01-14 05:45

    It would be the same reason for the existence of the command git rerere (Reuse recorded resolution of conflicted merges)
    See "rerere your boat" and "Fix conflicts only once with git rerere".

    Git does not record merge conflict resolution for any merge (including the one done again during a rebase -p)

    Basically, a conflict merge resolution is a manual step (meaning a human decision has to be made), which git is not able to reproduce automatically (it is, or rather was, a "stupid" content tracker after all).
    Git is only able to record said resolution (if one activates rerere first)

    0 讨论(0)
提交回复
热议问题