解决 gitpush时错误 error: failed to push some refs to

精选30+云产品，助力企业轻松上云！>>>

错误信息

push时出错

$ git push origin master
To https://gitee.com/xindongwl/knowledge-pay-app.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://gitee.com/xindongwl/knowledge-pay-app.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
remote: Enumerating objects: 303, done.
remote: Counting objects: 100% (303/303), done.
remote: Compressing objects: 100% (171/171), done.
remote: Total 303 (delta 102), reused 299 (delta 101), pack-reused 0
Receiving objects: 100% (303/303), 1.32 MiB | 738.00 KiB/s, done.
Resolving deltas: 100% (102/102), done.
From https://gitee.com/xindongwl/knowledge-pay-app
 * branch            master     -> FETCH_HEAD
 * [new branch]      master     -> origin/master
error: The following untracked working tree files would be overwritten by merge:
        App.vue
        README.md
        common/common.js
        unpackage/dist/dev/.tmp/app-plus/pageforum/forum/edit.js
		.....(注:这还有一堆文件,就不复制了)
        unpa
Aborting

解决

先执行该命令：git pull origin master --allow-unrelated-histories

git pull origin master --allow-unrelated-histories  意思是将两个没有关系的分支,强行合并。出现冲突再解决冲突即可

执行之后再push即可：git push origin master

就这样