If you did this already, delete the swap file ".git/.MERGE_MSG.swp"时间:2023-03-09 18:13:11 出现这种情况一般是不正常退出造成的,找到隐藏文件后删除解决