git 本地与远程仓库出现代码冲突解决方法

提交过程中报错:

[python@heaven-00 Selesystem]$ git push -u origin master
Username for 'https://github.com': sdfasname
Password for 'https://nighttidesy@github.com':
To https://github.com/nighttidesy/-Selesystem.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'https://github.com/nighttidesy/-Selesystem.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.

解决方法:

1.将远程仓库代码拉取到本地作为本地的一个新的分支 lingshi

[python@heaven-00 Selesystem]$ git fetch origin master:lingshi 

2.将这个lingshi的分支与我们的主分支对比查看有什么不同，有那些冲突

[python@heaven-00 Selesystem]$ git diff lingshi

3.将新的lingshi分支与本地主分支合并

[python@heaven-00 Selesystem]$ git merge lingshi

4.重新提交本地主分支到远程仓库

[python@heaven-00 Selesystem]$ git push -u origin master

[python@heaven-00 Selesystem]$ git push -u origin master
Username for 'https://github.com': sdfasname
Password for 'https://nighttidesy@github.com': 
Counting objects: 6, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (6/6), 25.50 KiB | 0 bytes/s, done.
Total 6 (delta 2), reused 0 (delta 0)
remote: Resolving deltas: 100% (2/2), completed with 1 local object.
To https://github.com/nighttidesy/-Selesystem.git
5194ae2..939b6ee master -> master
Branch master set up to track remote branch master from origin.

成功

5.删除新的分支

[python@heaven-00 Selesystem]$ git branch -d lingshi