点击页面右上角的+号,在github新建一个仓库:
![](https://image.shishitao.com:8440/aHR0cHM6Ly9pbWcyMDE4LmNuYmxvZ3MuY29tL2Jsb2cvMTU4MTMwNy8yMDE5MDEvMTU4MTMwNy0yMDE5MDExNjEwMjIxOTI5My0xNjA4NTczNzkxLnBuZw%3D%3D.png?w=700&webp=1)
![](https://image.shishitao.com:8440/aHR0cHM6Ly9pbWcyMDE4LmNuYmxvZ3MuY29tL2Jsb2cvMTU4MTMwNy8yMDE5MDEvMTU4MTMwNy0yMDE5MDExNjEwMjI0MzU1NS04ODAyMjYzNjQucG5n.png?w=700&webp=1)
在桌面新建manager 和 zhangsan 两个文件夹 ,然后打开manager 文件夹,输入命令:git clone https://github.com/randompaga/test009.git ,将GitHub上新建的项目test009 仓库复制到 manager 文件夹里。
![](https://image.shishitao.com:8440/aHR0cHM6Ly9pbWcyMDE4LmNuYmxvZ3MuY29tL2Jsb2cvMTU4MTMwNy8yMDE5MDEvMTU4MTMwNy0yMDE5MDExNjEwMjMwNTE2MC0xOTkyNDIxOTc2LnBuZw%3D%3D.png?w=700&webp=1)
git config user.name \'老大\'
git config user.email \'manager@163.com\'
设置 config 配置信息:
![](https://image.shishitao.com:8440/aHR0cHM6Ly9pbWcyMDE4LmNuYmxvZ3MuY29tL2Jsb2cvMTU4MTMwNy8yMDE5MDEvMTU4MTMwNy0yMDE5MDExNjEwMjMyMjgxOC0xMDExODY3ODI5LnBuZw%3D%3D.png?w=700&webp=1)
配置后:
![](https://image.shishitao.com:8440/aHR0cHM6Ly9pbWcyMDE4LmNuYmxvZ3MuY29tL2Jsb2cvMTU4MTMwNy8yMDE5MDEvMTU4MTMwNy0yMDE5MDExNjEwMjMzNTcwNC0xMjU0OTE0MjIyLnBuZw%3D%3D.png?w=700&webp=1)
![](https://image.shishitao.com:8440/aHR0cHM6Ly9pbWcyMDE4LmNuYmxvZ3MuY29tL2Jsb2cvMTU4MTMwNy8yMDE5MDEvMTU4MTMwNy0yMDE5MDExNjEwMjM1MDM5Ny0yMTIxMzMzNzc0LnBuZw%3D%3D.png?w=700&webp=1)
用git push 命令 将刚刚写的eat.py文件上传至github ,需要输入github 的账户名和密码:
![](https://image.shishitao.com:8440/aHR0cHM6Ly9pbWcyMDE4LmNuYmxvZ3MuY29tL2Jsb2cvMTU4MTMwNy8yMDE5MDEvMTU4MTMwNy0yMDE5MDExNjEwMjQwMTc3Mi0xNzkzMjQ0MjI3LnBuZw%3D%3D.png?w=700&webp=1)
上传成功:
![](https://image.shishitao.com:8440/aHR0cHM6Ly9pbWcyMDE4LmNuYmxvZ3MuY29tL2Jsb2cvMTU4MTMwNy8yMDE5MDEvMTU4MTMwNy0yMDE5MDExNjEwMjQxMjk1NC0xNjM5NDEwLnBuZw%3D%3D.png?w=700&webp=1)
打开eat.py。可以看到刚刚写的代码:
![](https://image.shishitao.com:8440/aHR0cHM6Ly9pbWcyMDE4LmNuYmxvZ3MuY29tL2Jsb2cvMTU4MTMwNy8yMDE5MDEvMTU4MTMwNy0yMDE5MDExNjEwMzg0MDExNC0xNzA1MDkzOTUucG5n.png?w=700&webp=1)
设置存储密码,下次 git pull 的时候不用再输入密码
![](https://image.shishitao.com:8440/aHR0cHM6Ly9pbWcyMDE4LmNuYmxvZ3MuY29tL2Jsb2cvMTU4MTMwNy8yMDE5MDEvMTU4MTMwNy0yMDE5MDExNjEwMjQzODYzNi0xMzg4MzcxMTAxLnBuZw%3D%3D.png?w=700&webp=1)
git add . git commit -m \'添加小狗吃肉\' git push
刷新githua 页面:
![](https://image.shishitao.com:8440/aHR0cHM6Ly9pbWcyMDE4LmNuYmxvZ3MuY29tL2Jsb2cvMTU4MTMwNy8yMDE5MDEvMTU4MTMwNy0yMDE5MDExNjEwMjQ1MDQ3NC0xODA1ODM3MTg5LnBuZw%3D%3D.png?w=700&webp=1)
更新后的代码被提交了上去。
用同样的方法在桌面新建文件夹zhangsan ,并将项目克隆至该文件夹。
用gedit方法 分别打开 manager 和 zhangsan 文件夹中的 eat.py文件夹。并添加代码:
![](https://image.shishitao.com:8440/aHR0cHM6Ly9pbWcyMDE4LmNuYmxvZ3MuY29tL2Jsb2cvMTU4MTMwNy8yMDE5MDEvMTU4MTMwNy0yMDE5MDExNjEwMjUwMzA0MC0xODUzNTMwNDUyLnBuZw%3D%3D.png?w=700&webp=1)
老大先提交代码,print("老大说,不吃了"),可以正常提交。
张三后提交代码,print("小猫小猫爱吃鱼,今天就吃鱼。")
发生冲突,GitHub不知道以哪个版本为准。
![](https://image.shishitao.com:8440/aHR0cHM6Ly9pbWcyMDE4LmNuYmxvZ3MuY29tL2Jsb2cvMTU4MTMwNy8yMDE5MDEvMTU4MTMwNy0yMDE5MDExNjEwMjYwMjc1MS0xNzY2Njk4Mjk4LnBuZw%3D%3D.png?w=700&webp=1)
解决方法:张三git push 的时候,先git pull一下,将老大修改过的最新版down下来。
![](https://image.shishitao.com:8440/aHR0cHM6Ly9pbWcyMDE4LmNuYmxvZ3MuY29tL2Jsb2cvMTU4MTMwNy8yMDE5MDEvMTU4MTMwNy0yMDE5MDExNjEwMjYxMzUzNi0xMjIwOTg5MzI0LnBuZw%3D%3D.png?w=700&webp=1)
![](https://image.shishitao.com:8440/aHR0cHM6Ly9pbWcyMDE4LmNuYmxvZ3MuY29tL2Jsb2cvMTU4MTMwNy8yMDE5MDEvMTU4MTMwNy0yMDE5MDExNjEwMjYzMDA2OS0zMTU4ODE4MzgucG5n.png?w=700&webp=1)
可以看到老大写的代码。不要改别人的代码。修改一下提交:
![](https://image.shishitao.com:8440/aHR0cHM6Ly9pbWcyMDE4LmNuYmxvZ3MuY29tL2Jsb2cvMTU4MTMwNy8yMDE5MDEvMTU4MTMwNy0yMDE5MDExNjEwMjY0OTE3Mi0xMTA2NDgxOTcucG5n.png?w=700&webp=1)