git多分支开发操作

梦里梦外; 2023-02-21 11:56 22阅读 0赞

#### 1.如果正在写登录模块 ####

//创建一个名为login的分支
    git checkout -b login

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

#### 2.查看有多少分支 ####

git branch

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

#### 3.切换分支 ####

git checkout master    //切换到master上
    git checkout login    //切换到login上

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

#### 4.合并分支 ####

例如：我现在在login分支下，完成了登录功能

git add .
    git commit -m "完成了登录功能"
    // 查看所处的分支
    git branch
    //切换到master分支
    git checkout master
    //在master分支下合并login分支
    git merge login
    // 推送到远端的master分支下
    git push

把login分支也推送到远端

// 切换到login子分支中
    git checkout login
    //把login本地子分支推送到origin远端的叫做login的子分支中
    git push -u origin login

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

[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzQzNTU0OTk3_size_16_color_FFFFFF_t_70]: https://img-blog.csdnimg.cn/20200630153241557.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzQzNTU0OTk3,size_16,color_FFFFFF,t_70
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzQzNTU0OTk3_size_16_color_FFFFFF_t_70 1]: https://img-blog.csdnimg.cn/20200630153422106.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzQzNTU0OTk3,size_16,color_FFFFFF,t_70
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzQzNTU0OTk3_size_16_color_FFFFFF_t_70 2]: https://img-blog.csdnimg.cn/20200630153821400.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzQzNTU0OTk3,size_16,color_FFFFFF,t_70
[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzQzNTU0OTk3_size_16_color_FFFFFF_t_70 3]: https://img-blog.csdnimg.cn/20200701204600489.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3FxXzQzNTU0OTk3,size_16,color_FFFFFF,t_70