[root@foundation38 demo]# git push -u origin master
Username for 'https://github.com': xuefeilong
Password for 'https://xuefeilong@github.com':
To https://github.com/xuefeilong/test.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/xuefeilong/test.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
1: 進行push前先將遠程倉庫pull到本地倉庫
$ git pull origin master #git pull --rebase origin master
$ git push -u origin master
2: 強制push本地倉庫到遠程 (這種情況不會進行merge, 強制push后遠程文件可能會丟失 不建議使用此方法)
$ git push -u origin master -f
3: 避開解決沖突, 將本地文件暫時提交到遠程新建的分支中
$ git branch [name]
# 創建完branch后, 再進行push
$ git push -u origin [name]
