1,添加主干的地址:
git remote add main https://github.com/qiujiayu/AutoLoadCache.git
2,查询分支
git remote -v
main https://github.com/qiujiayu/AutoLoadCache.git (fetch)
main https://github.com/qiujiayu/AutoLoadCache.git (push)
origin https://github.com/yuanhotel/AutoLoadCache (fetch)
origin https://github.com/yuanhotel/AutoLoadCache (push)
3,把对方的代码拉到你本地
git fetch main
4,合并对方的代码
git merge main/master
5,最新的代码推送到你的github上
git push origin master