Cannot git merge --abort until git status

前端 未结 3 623
你的背包
你的背包 2020-12-19 07:11

First I merge sth, then conflicts occurs, so I git merge --abort, but failed, I have to do git status first, then git merge --abort su

3条回答
  •  Happy的楠姐
    2020-12-19 08:04

    In my case, git status didn't help, but after committing local changes it was then willing to abort.

    My git version: v2.25.0.windows.1

提交回复
热议问题