gitlab 使用遇到的问题
1. error: Pull is not possible because you have unmerged files.
cause: commit the code before git stash pop.
key: git reset --hard FETCH_HEAD
why: 本地的push和merge会形成MERGE-HEAD(FETCH-HEAD),HEAD(PUSH-HEAD)这样的引用。HEAD代表本地最近成功push后形成的引用。MERGE-HEAD表示成功pull后形成的.
原创
2021-12-17 15:34:47 ·
276 阅读 ·
0 评论