git rebase

打算将本机工程上传到github上面，在git上面创建了新的repository后

在本地版本库初始化后打算推到远程分支。

直接git push -u origin master

 ! [rejected]        master -> master (fetch first)

error: failed to push some refs to 'https://github.com/super-will/jdbcdemo.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.
 

发现是由于远程仓库初始化时创建的readme文件没有下载下来

应该用git pull --rebase origin master先将远端的代码merge下来

然后git push -u origin master

 

转载于:https://my.oschina.net/u/3403903/blog/880476