error: You have not concluded your merge (MERGE_HEAD exists). git pull拉取代码失败!
$ git push
To ssh://47.95.35.53:2222/php-item/php-test.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'ssh://git@47.95.35.53:2222/php-item/php-test...
原创
2018-07-24 12:07:31 ·
5892 阅读 ·
0 评论