1.mac版git创建ssh key 连接远程仓库地址
https://www.jianshu.com/p/ff1034ed270e
2.push时报错
$ git push -u origin master
To [email protected]:yangchao0718/cocos2d.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to '[email protected]:yangchao0718/cocos2d.git
hint: Updates were rejected because the tip of your current branch is behin
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
https://www.jianshu.com/p/835e0a48c825
暂时遇到这两个问题查到上面两个地址完美解决了，后续遇到在加，
其他的查到的有
1. a.--> git pull origin master
b.--> git push origin master
2. git push -f
3. git push -u origin master
4.中止合并->重新合并->重新拉取
git merge --abort
git reset --merge
git pull
5.强制合并分支拉取
git pull origin master --allow-unrelated-histories
6. The remote end hung up unexpectedly 掉网了 尴尬。。。。。