0
我用以下方法了一会儿:混帐合并停止工作
git fetch origin master
git merge origin/master
git push --dry-run origin master
git push origin master
现在,这已停止工作,并产生这个错误
To [email protected]:company/project/admin.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to '[email protected]:company/project/admin.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.
,现在唯一的Git拉的作品,而不是获取和合并。
为什么会发生这种情况?其他开发人员也会遇到这种情况。