今天在本地新建了個項目，在碼云上也建了個倉庫，想從本地推送到碼云，但是git push -u origin master，報錯：

 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'https://gitee.com/xxx/app.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 解決
rebase與merge區別:

rebase 會把你當前分支的 commit 放到公共分支的最后面,所以叫變基。
merge 會把公共分支和你當前的commit 合并在一起，形成一個新的 commit 提交