报错提示:[rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'gitee.com:xxx/xxx.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.
参考链接:git如何解决冲突?_每次都要执行git merge origin main怎么办-CSDN博客
1.先git add .
2.git commit -m 'update........'
3.然后git push origin master
4.如果报错下面的问题:
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'gitee.com:xxx/xxx.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.
上面的意思就是代码有冲突,所以要先pull拉取代码下拉,所以先运行 git pull origin master
5.拉取代码下拉后,然后解决冲突,打开项目代码,查看代码文件内容哪里有冲突。(下图截取自参考链接的内容)
绿色圈起来的代码是自己写的,红色圈起来的代码是别人写的,看你要保留哪部分,不要的那部分就删除了,并且把这些符号(<<<<<<< 与 ======= )也删除了
6.然后再git push origin master应该就可以了。