How to identify conflicting commits by hash during git rebase?

后端 未结 8 1863
误落风尘
误落风尘 2020-12-01 03:37

When I encounter a merge conflict using git rebase, how can I identify the source of the conflict in terms of commits, rather than just file difference

8条回答
  •  抹茶落季
    2020-12-01 04:07

    To see the commit that was being applied when the conflict occurred, use...

    git am --show-current-patch
    

提交回复
热议问题