error: src refspec xbd-admin-hotfix does not match any
error: failed to push some refs to 'xbd-admin.git'
git push origin HEAD -u
$ git pull
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
翻译过来：
错误：无法提取，因为您有未合并的文件。
提示：在工作树中修复它们，然后使用“git add/rm<file>”
提示：根据需要标记解决方案并提交。
致命：由于未解决的冲突而退出。
解决方法：
提示了先提交
那么就是
git add.
git commit -m "xxx"
git pull origin master
git add .
git commit -m "xxx"
git push origin master
