记一下本地的代码放到新仓库时 Updates were rejected because the remote contains work that you do not have locally

首先确认知识点

git pull (从远端同步代码到本地,不会覆盖本地文件,如果不放心看第二个知识点)

git stash (将代码藏起来,建议先git add . 再操作这一步)

git stash pop 将藏起来的代码覆盖到当前分支上;

说回我们遇到的问题

云端创建一个新仓库,

本地命令行

git init ;

git remote add origin '云端仓库地址' ;

git add . ;

git commit -m '';

git push (git push -f);

会看到控制台报错了

1  ! [rejected]        master -> master (non-fast-forward)
2 hint: Updates were rejected because the tip of your current branch is behind
3 hint: its remote counterpart. Integrate the remote changes (e.g.
4 hint: 'git pull ...') before pushing again.
5 hint: See the 'Note about fast-forwards' in 'git push --help' for details.

##解决办法

本地命令行:

git add .;

git stash;

git pull --rebase origin master; (会询问你要不要删除差异文件最好选择 n, 因为是以本地为准 )

git stash pop;

git commit -m '';

git push -u origin master;

会发现推送就成功了 !

Enumerating objects: 502, done.
Counting objects: 100% (502/502), done.
Delta compression using up to 4 threads
Compressing objects: 100% (486/486), done.
Writing objects: 100% (501/501), 8.35 MiB | 31.00 KiB/s, done.
Total 501 (delta 35), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (35/35), done.
remote: Powered by GITEE.COM [GNK-6.4]