diff --git a/Img/image-20250327012946382.png b/Img/image-20250327012946382.png new file mode 100644 index 0000000..291c506 Binary files /dev/null and b/Img/image-20250327012946382.png differ diff --git a/Img/image-20250327013104929.png b/Img/image-20250327013104929.png new file mode 100644 index 0000000..03066de Binary files /dev/null and b/Img/image-20250327013104929.png differ diff --git a/Img/image-20250327013513472.png b/Img/image-20250327013513472.png new file mode 100644 index 0000000..cb1a276 Binary files /dev/null and b/Img/image-20250327013513472.png differ diff --git a/Img/image-20250327015125471.png b/Img/image-20250327015125471.png new file mode 100644 index 0000000..b5d5eea Binary files /dev/null and b/Img/image-20250327015125471.png differ diff --git a/Img/image-20250327015322890.png b/Img/image-20250327015322890.png new file mode 100644 index 0000000..1bd7f6f Binary files /dev/null and b/Img/image-20250327015322890.png differ diff --git a/Note/TortoiseGit食用.md b/Note/TortoiseGit食用.md index 3a942ac..f233a10 100644 --- a/Note/TortoiseGit食用.md +++ b/Note/TortoiseGit食用.md @@ -18,4 +18,36 @@ * 直接接着上一步进行操作点击推送 -![image-20250327005909146](D:\Xiaomi_Note\Img\image-20250327005909146.png) \ No newline at end of file +![image-20250327005909146](D:\Xiaomi_Note\Img\image-20250327005909146.png) + +# 二、使用TortoiseGit进行分布式协同开发 + +## 创建分支 + +> 采取团队开发模式，先clone主仓库，再创建分支进行开发，要注意保护主仓库 + +加入仓库的同学首先应该在头歌仓库中创建自己的分支 + +![image-20250327012946382](D:\Xiaomi_Note\Img\image-20250327012946382.png) + +分支起点应选择main，当我们初始化好自己的分支 + +![image-20250327013104929](D:\Xiaomi_Note\Img\image-20250327013104929.png) + +在头歌仓库中创建好后需要在本地进行创建分支，名称要一致 + +![image-20250327013513472](D:\Xiaomi_Note\Img\image-20250327013513472.png) + +## 切换分支 + +切记要切换到自己创建的分支上而不是main主分支 + +![image-20250327015125471](D:/Xiaomi_Note/Img/image-20250327015125471.png) + +其他操作基本一致 + +## 合并请求 + +![image-20250327015322890](D:/Xiaomi_Note/Img/image-20250327015322890.png) + +向主分支提pr，经过确认后可以将内容合并至主仓库 \ No newline at end of file diff --git a/README.md b/README.md index 1e02121..c97ce9a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # Xiaomi_Note -> 加入仓库的同学请阅读Note目录下的食用指南，快速熟悉掌握git操作，并且创建自己的分支，此分支为总分支，请不要随意合并，提pr后大家共同协调。不习惯md文档阅读的同学可以参考这篇文章进行学习分布式协同开发[Git客户端(TortoiseGit)使用详解-CSDN博客](https://blog.csdn.net/scott198510/article/details/138337623?ops_request_misc=%7B%22request%5Fid%22%3A%2274a51f7f8e5655eeb31d1771b0feb36f%22%2C%22scm%22%3A%2220140713.130102334..%22%7D&request_id=74a51f7f8e5655eeb31d1771b0feb36f&biz_id=0&utm_medium=distribute.pc_search_result.none-task-blog-2~all~top_click~default-2-138337623-null-null.142^v102^pc_search_result_base3&utm_term=tortoisegit使用教程&spm=1018.2226.3001.4187) +> 加入仓库的同学请阅读Note目录下的食用指南（主要第二部分），快速熟悉掌握git操作，并且创建自己的分支，此分支为总分支，请不要随意合并，提pr后大家共同协调。不习惯md文档阅读的同学可以参考这篇文章进行学习分布式协同开发[Git客户端(TortoiseGit)使用详解-CSDN博客](https://blog.csdn.net/scott198510/article/details/138337623?ops_request_misc=%7B%22request%5Fid%22%3A%2274a51f7f8e5655eeb31d1771b0feb36f%22%2C%22scm%22%3A%2220140713.130102334..%22%7D&request_id=74a51f7f8e5655eeb31d1771b0feb36f&biz_id=0&utm_medium=distribute.pc_search_result.none-task-blog-2~all~top_click~default-2-138337623-null-null.142^v102^pc_search_result_base3&utm_term=tortoisegit使用教程&spm=1018.2226.3001.4187)