标签：git
git init # 创建本地仓库 # 设置远程仓库地址，这里可以设置ssh 或 https 的形式，此处设置为https 格式， # ssh 格式为 ： git remote add origin git@coding.net:sql031625/test.git git remote add origin https://git.coding.net/sql031625/test.git touch a.py # 创建文件，使仓库有新的变更 git add . # 添加所有变更 git commit -m 'first' # 注释 git push -u oringin master # 推送代码，第一次使用 -u ，以后便可以不使用 -u 参数 # 可以设置 git config --global push.default matching命令，使得push命令默认push到github的同名仓库中若最后一步出错，
ralap@Ubuntu:~/data/coder/webtest$ git push -u origin master Username for 'https://git.coding.net': sql031625 Password for 'https://sql031625@git.coding.net': To https://git.coding.net/sql031625/webtest.git ! [rejected] master -> master (fetch first) error: failed to push some refs to 'https://git.coding.net/sql031625/webtest.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.
原因分析：在github上重新创建仓库，建立README.md，导致该文件不在本地代码中，执行以下命令，将git 仓库中的文件与本地合并，然后再上传即可
git pull --rebase origin master git push -u oringin master
标签：git
原文地址：http://blog.51cto.com/songqinglong/2109126
