将Linux服务器上的项目代码托管到开源中国码云。
步骤:
一、在码云新建项目,并复制项目ssh克隆地址。如:
git@git.oschina.net:xxx/xxx.git
二、项目根目录初始化本地仓库
git init
三、提交项目到本地仓库
git add . git commit -m '提交说明'
四、添加远程仓库地址,远程仓库地址即项目ssh克隆地址
git remote add origin git@git.oschina.net:xxx/xxx.git
五、将本地代码推送到别名为origin的仓库中的master分支
git push -u origin master
问题:
执行第五部报如下错误:
[root@localhist xxx]# git push -u origin master To git@git.oschina.net:xxx/xxx.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'git@git.oschina.net:xxx/xxx.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details.
解决:
因为在码云新建项目后,自动生成了README.md文件,需要将该文件更新到本地后推送到远程仓库
[root@localhist xxx]# git fetch warning: no common commits remote: Counting objects: 3, done. remote: Total 3 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From git.oschina.net:xxx/xxx * [new branch] master -> origin/master [root@localhist xxx]# git merge origin/master Auto-merging README.md Merge made by recursive. README.md | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) [root@localhist xxx]# git push -u origin master Counting objects: 3248, done. Delta compression using up to 2 threads. Compressing objects: 100% (3076/3076), done. Writing objects: 100% (3247/3247), 3.63 MiB | 837 KiB/s, done. Total 3247 (delta 1483), reused 0 (delta 0) remote: Resolving deltas: 100% (1483/1483), done. To git@git.oschina.net:xxx/xxx.git d4317ed..593232e master -> master Branch master set up to track remote branch master from origin.
本文链接:https://jeff.xin/post/67.html
--EOF--
发表于 2017-08-14 ,并被添加「 Git 」标签 。
Comments
发表评论:
◎欢迎参与讨论,请在这里发表您的看法、交流您的观点。