hint: not have locally. This is usually caused by another repository pushing

Posted 2021-12-14 kaerxifa

 

git 提交代码前先pull代码,否则会报如下错误

 

 

[email protected]:~/test/reponselogiccheck$ git status
On branch master
Your branch is ahead of ‘origin/master‘ by 1 commit.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean
[email protected]:~/test/reponselogiccheck$ git push
To git.5i5j.com:kaifa/reponselogiccheck.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to ‘[email protected]:kaifa/reponselogiccheck.git‘
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., ‘git pull ...‘) before pushing again.
hint: See the ‘Note about fast-forwards‘ in ‘git push --help‘ for details.
[email protected]:~/test/reponselogiccheck$ git pull
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From git.5i5j.com:kaifa/reponselogiccheck
   2a5b889..e69bef2  master     -> origin/master
Auto-merging a.py
CONFLICT (content): Merge conflict in a.py
Automatic merge failed; fix conflicts and then commit the result.
[email protected]:~/test/reponselogiccheck$ ls
a.py  bb.py  testGitlab