git-记一次提交错误 : Updates were rejected because the tip of your current branch is behind

xxx@xxx-l1 MINGW64 /c/项目/python_test_for_cicd (dev_xxy)
$ git push origin dev_xxy
To adgit.src.corp.qihoo.net:xxx/python_test_for_cicd.git
 ! [rejected]        dev_xxy -> dev_xxy (non-fast-forward)
error: failed to push some refs to 'adgit.src.corp.xxx.net:xxx/python_test_for_cicd.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.

产生以上错误原因是因为本人再线上改代码了，解决办法是拉取线上代码merge到本地

$ git pull origin dev_xxy
From adgit.src.corp.xxx.net:xxx/python_test_for_cicd
 * branch            dev_xxy    -> FETCH_HEAD
Auto-merging python_test.py
CONFLICT (content): Merge conflict in python_test.py
Automatic merge failed; fix conflicts and then commit the result.

然后解决冲突后，add,commit即可

 git add .
git commit -m "after merge3"
 git push origin dev_xxy