To git@github.com:xxx/xxxxx.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:xxx/xxxxx.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again. See the 'Note about
fast-forwards' section of 'git push --help' for details.
当我尝试推送一些更改时,出现了这个错误。当我尝试从仓库获取时,出现以下情况:
From github.com:xxx/xxxxx
* branch master -> FETCH_HEAD
我该怎么做才能解决这个问题?到目前为止,只有我在这个代码库上工作,其他人只给了我两次推送。我需要进行正确的合并吗?