版本管理——gitee和git的使用
<p><span style="font-size: 18px"><strong>一、gitee和git能解决的问题</strong></span></p><p><span style="font-size: 16px">我们开发小组，有三位同学，怎么共享代码？</span></p>
<p><span style="font-size: 16px">我更新代码后，怎么传递给另外两位同学？</span></p>
<p><span style="font-size: 16px">我和别人同时修改了一个文件，怎么办？</span></p>
<p><span style="font-size: 18px"><strong>二、准备</strong></span></p>
<p><span style="font-size: 16px">注册gitee：https://gitee.com/</span></p>
<p><span style="font-size: 16px">注意事项：给个人空间地址取个好名字</span></p>
<p><span style="font-size: 16px">下载git：https://git-scm.com/downloads</span></p>
<p><span style="font-size: 16px">安装git：出现一堆选项，我全选了默认；</span></p>
<p><span style="font-size: 16px">建议：将line ending conversion 改为“checkout as is，commit as is”，不要让git帮你改</span></p>
<p><img src="https://img2018.cnblogs.com/blog/1419447/201909/1419447-20190930093648806-1215515342.png"></p>
<p><span style="font-size: 18px"><strong>三、建gitee仓库</strong></span></p>
<p><span style="font-size: 16px">必填的只有仓库名称和路径，其他的默认就好</span></p>
<p><span style="font-size: 16px">仓库地址构成——https://gitee.com/个人空间地址/仓库名</span></p>
<p><img src="https://img2018.cnblogs.com/blog/1419447/201909/1419447-20190930102524436-610638568.png"></p>
<p><span style="font-size: 18px"><strong>四、git配置</strong></span></p>
<p><span style="font-size: 16px">新建个文件夹，右键，选择“git bash here” </span></p>
<p><span style="font-size: 16px"><img src="https://img2018.cnblogs.com/blog/1419447/201909/1419447-20190930112721633-1256885527.png"></span></p>
<p><span style="font-size: 16px">用户名：git config --global user.name "xiaoming"</span></p>
<p><span style="font-size: 16px">邮箱：git config --global user.email "xiaoming@example.com"</span></p>
<p><img src="https://img2018.cnblogs.com/blog/1419447/201909/1419447-20190930112932823-1173549241.png"></p>
<p><span style="font-size: 18px"><strong>五、clone/push/pull 操作</strong></span></p>
<p><span style="font-size: 16px">clone：将码云上的仓库复制一份到本地；</span></p>
<p><span style="font-size: 16px">push：将本地修改后的代码推送上码云；</span></p>
<p><span style="font-size: 16px">pull：将别人推送的代码拉取到本地；</span></p>
<p><span style="font-size: 16px"><strong>clone：</strong></span></p>
<p><span style="font-size: 16px">git clone https://gitee.com/个人空间/仓库名</span></p>
<p><img src="https://img2018.cnblogs.com/blog/1419447/201909/1419447-20190930102953834-2054926203.png"></p>
<p><span style="font-size: 18px"><strong> add->commit->push：</strong></span></p>
<p><span style="font-size: 16px">git add .</span></p>
<p><span style="font-size: 16px">git commit [-m "修改说明”]</span></p>
<p><span style="font-size: 16px">git push origin master</span></p>
<p><img src="https://img2018.cnblogs.com/blog/1419447/201909/1419447-20190930140617948-844914282.png"></p>
<p><span style="font-size: 16px"><strong>pull：</strong></span></p>
<p><span style="font-size: 16px">git pull origin master</span></p>
<p><img src="https://img2018.cnblogs.com/blog/1419447/201909/1419447-20190930143541786-1305225298.png"></p>
<p> </p>
<p><strong><span style="font-size: 16px">gitee工作台的动态更新</span></strong></p>
<p><img src="https://img2018.cnblogs.com/blog/1419447/201909/1419447-20190930142221127-1573024937.png"></p>
<p><img src="https://img2018.cnblogs.com/blog/1419447/201909/1419447-20190930142041150-891542945.png"></p>
<p><span style="font-size: 18px"><strong>六、其他</strong></span></p>
<p><span style="font-size: 16px">上传代码片段</span></p>
<p><img src="https://img2018.cnblogs.com/blog/1419447/201909/1419447-20190930144653421-1450770680.png"></p>
<p><span style="font-size: 16px">fork：看到想参与的gitee项目，fork到自己的码云仓库中</span></p>
<p><span style="font-size: 16px">watch：watch项目进展，不参与项目</span></p>
<p><span style="font-size: 16px">pull request：向审核人员发送pull request，等待通过</span></p>
<p><span style="font-size: 16px">（讲道理，为什么不叫push request？）</span></p>
<p><span style="font-size: 16px">可能的答案：https://cloud.tencent.com/developer/article/1348651</span></p>
<p><strong><span style="font-size: 18px">七、回答开头的问题</span></strong></p>
<p><span style="font-size: 16px">代码共享：从gitee仓库中clone或pull</span></p>
<p><span style="font-size: 16px">代码更新：从本地pull到gitee仓库</span></p>
<p><span style="font-size: 16px">冲突管理：push时，如果有冲突（比如文件已经被别人修改过了），建议你重新pull一次仓库<br></span></p>
<p><span style="font-size: 16px"><img src="https://img2018.cnblogs.com/blog/1419447/201909/1419447-20190930153802871-1852434115.png"></span></p>
<p> </p><br><br>
来源：https://www.cnblogs.com/jennica/p/11611466.html
頁:
[1]