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
我该怎么做才能解决这个问题？到目前为止,基本上只有我在回购中,我只有两次来自其他人.我需要做一个合适的合并吗？