Github(远程库)
2020-03-16 本文已影响0人
码农GG
1.创建github远程库
https://github.com/
2.配置本地关联远程连接

git remote -v 查看当前所有远程地址别名
git remote add[别名][远程地址]

自动弹出输入github账号管理远程库

3.克隆
3.1命令
git origin[远程地址]

1.完整的把远程库下载到本地
2.创建origin 远程地址别名
3.初始化本地库
3.2提交到远程库失败(需要加入团队)
3.2.1提交失败

3.2.2邀请加入团队


3.2.3提交远程成功

4.拉取pull
4.1pull=fetch+merge
git fetch[远程库地址别名][远程分支名]
1.fetch后本地库没有变化:

2.切换到远程库查看:


4.2合并
git merge[远程库地址别名/远程分支名]
先查看一下本地库还是老版本,再把本地库和远程库合并

5.管理员直接pull(fetch+merge)


6.解决冲突
要点:
如果不是基于Github 远程库的最新版本所做修改,不能推送,必须先拉取。
拉取下来后如果进入冲突状态,则按照“分支冲突解决” 操作解决即可。
第一个人修改提交

第二个人修改提交,能正常提交本地库,远程库提交失败,需要先拉取pull。

拉取后是在冲突状态

成功处理冲突,提交远程github库

7.跨团队协作
7.1Fork

7.2当前账号所有人是337157248,制定来源

7.3本地修改提交远程

出现冲突,先pull ( git pull origin master
),再 git push origin master成功。

7.4pull request


点击到创建pull request 页面

创建pull request

管理员pull request

点击开始合并工作

可以对话

查看修改信息

合并代码

填写合并信息

最后将远程库拉取到本地
8.ssh 免密登录

