git合并仓库冲突

  • A+
所属分类:应用工具
 >git push -u origin master
To https://gitee.com/codeinfo1/me-at.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'https://gitee.com/codeinfo1/me-at.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.

主要问题是远程仓库和本地仓库的文件存在不同

合并冲突

git pull --rebase origin master
  • 公众号
  • 扫一扫
  • weinxin
  • 打赏
  • 扫一扫
  • weinxin

发表评论

:?: :razz: :sad: :evil: :!: :smile: :oops: :grin: :eek: :shock: :???: :cool: :lol: :mad: :twisted: :roll: :wink: :idea: :arrow: :neutral: :cry: :mrgreen: