git 问题

🧙 Questions

☄️ Ideas

commit your changes before merging.

error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.

解决方案

合并代码前，需要commit自己改动的内容

unable to update local ref

From git.dfy.definesys.cn:apaas/xdap-manage
   9a8a41320..59e6055ba  papaas-dev -> origin/papaas-dev
error: cannot lock ref 'refs/remotes/origin/niuxt-papaas-feature-F001230': is at 432d404258bf88851298675ba43501483171b971 but expected d37e3e2791bfcbb27e67651aaafa624e8e38da0c
 ! d37e3e279..eacad11b8  niuxt-papaas-feature-F001230 -> origin/niuxt-papaas-feature-F001230  (unable to update local ref)

git gc  # 清理本地没用分支
git pull

🔗 Links

• git docs