git

…or create a new repository on the command line

echo "# tensorflowCNN" >> README.md
git init
git add README.md
git commit -m "first commit"
git remote add origin https://github.com/Rui012345/tensorflowCNN.git
git push -u origin master

…or push an existing repository from the command line

git remote add origin https://github.com/Rui012345/tensorflowCNN.git
git push -u origin master

…or import code from another repository

You can initialize this repository with code from a Subversion, Mercurial, or TFS project.

 

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.
--------------------- 
原文:https://blog.csdn.net/gddxz_zhouhao/article/details/53070317 

解决方法

两人同时fetch了一个分支。 第一个人修改后提交,第二个人提交就失败。

1.强制推送

$ git push -f 
可以提交,会将remote上第一个人的改动冲掉,比较暴力,不太好。

2.正常解决

先 git fetch origin 然后git merge origin/master, 和本地分支合并, 之后再push。

评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值