报错如下:
To gitlab.com:sunlizhen/datatem.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'git@gitlab.com:sunlizhen/datatem.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
解决办法:
有如下几种解决方法:
1,push前先将远程repository修改pull下来
$ git pull origin master
$ git push -u origin master
2,使用强制push的方法:
$ git push -f origin master (由于我是新建的项目没有别人所以我用的这个)
这样会使远程修改丢失,一般是不可取的,尤其是多人协作开发的时候。
3,若不想merge远程和本地修改,可以先创建新的分支:
$ git branch [name]
然后push
$ git push -u origin [name]

本文介绍了如何处理Git中master分支的非快进错误,包括先pull后push、强制push、创建新分支推送等方法,并强调了多人协作时的注意事项。
7273

被折叠的 条评论
为什么被折叠?



