1.在码云上创建项目 http://git.oschina.net ,,私有项目不用钱~
2.使用git 2.12.0.0 (下载安装git ,配置)
3.为项目添加远程库 (选中项目-OK )
4.先add 后 commit
commit and push --> commit
5.push之后,问题来了
push被拒,之前没有先pull,于是pull
直接在Android Studio界面操作pull出现错误~
Can't update: no tracked branch
No tracked branch configured for branch master.
To make your branch track a remote branch call, for example,
git branch --set-upstream master origin/master
在Terminal操作pull
语句:git pull
按照提示继续输入
语句:git branch --set-upstream-to=origin/master master 或者 git branch --set-upstream-to remotes/origin/master master
再次git pull,还有有错误~
fatal: refusing to merge unrelated histories
谷歌后,跟git的版本有关,新版本的git需要添加语句:
git pull origin master --allow-unrelated-histories
然后就可以pull 和 push ~ 有冲突就解决冲突~
解决方案:
git pull
git branch --set-upstream-to remotes/origin/master master
git pull origin master --allow-unrelated-histories