《专题五容器化微服务》之《第二章【补充资料】-Docker》之《第六节 Git版本控制工具》

刺骨的言语ヽ痛彻心扉 2023-10-04 14:19 2阅读 0赞

#### 文章目录 ####

*  《2.6.1 Git概述》
 *  《2.6.2 Git基础》
 *  《2.6.3 Git进阶》
 *  《2.6.4 Git协作开发》

## 《2.6.1 Git概述》 ##

![在这里插入图片描述][20210524223604246.png]

## 《2.6.2 Git基础》 ##

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3_size_16_color_FFFFFF_t_70]

## 《2.6.3 Git进阶》 ##

*  4 40 Git分支  
    ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3_size_16_color_FFFFFF_t_70 1]  
    ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3_size_16_color_FFFFFF_t_70 2]
 *  6 13  
    ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3_size_16_color_FFFFFF_t_70 3]
 *  18 39 rebase与 merge非fast forward对比  
    图解rebase：  
    ![在这里插入图片描述][8c99aa20c4da4fc2a9d8b9e8263c95b2.png]  
    在feature分支上执行`git rebase master`后：  
    ![在这里插入图片描述][79c9402a1c9b44778264a7ec84fc399e.png]
 *  19 35 暂存分支（git stash）

## 《2.6.4 Git协作开发》 ##

*  GitFlow :  
    ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3_size_16_color_FFFFFF_t_70 4]
 *  4分 Github :  
    ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3_size_16_color_FFFFFF_t_70 5]
 *  13 35+ 协同开发  
    ![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3_size_16_color_FFFFFF_t_70 6]
 *  18 53+ 搭建GitLab服务器

[20210524223604246.png]: https://img-blog.csdnimg.cn/20210524223604246.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3_size_16_color_FFFFFF_t_70]: https://img-blog.csdnimg.cn/20210524223736207.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3,size_16,color_FFFFFF,t_70
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3_size_16_color_FFFFFF_t_70 1]: https://img-blog.csdnimg.cn/20210525003936543.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3,size_16,color_FFFFFF,t_70
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3_size_16_color_FFFFFF_t_70 2]: https://img-blog.csdnimg.cn/20210525004218569.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3,size_16,color_FFFFFF,t_70
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3_size_16_color_FFFFFF_t_70 3]: https://img-blog.csdnimg.cn/20210525004453589.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3,size_16,color_FFFFFF,t_70
[8c99aa20c4da4fc2a9d8b9e8263c95b2.png]: https://img-blog.csdnimg.cn/8c99aa20c4da4fc2a9d8b9e8263c95b2.png
[79c9402a1c9b44778264a7ec84fc399e.png]: https://img-blog.csdnimg.cn/79c9402a1c9b44778264a7ec84fc399e.png
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3_size_16_color_FFFFFF_t_70 4]: https://img-blog.csdnimg.cn/20210525010519117.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3,size_16,color_FFFFFF,t_70
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3_size_16_color_FFFFFF_t_70 5]: https://img-blog.csdnimg.cn/20210525010736966.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3,size_16,color_FFFFFF,t_70
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3_size_16_color_FFFFFF_t_70 6]: https://img-blog.csdnimg.cn/2021052501162057.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzIzMjA0NTU3,size_16,color_FFFFFF,t_70