git 常用命令 Merge

雨点打透心脏的1/2处 2024-03-17 11:59 30阅读 0赞

#### 目录 ####

*   *  场景1：本地分支间合并
     *  场景2：远程release分支合并到本地dev分支
     *  场景3：\`git merge origin master\`和\`git merge origin/master\`的区别
     *  场景4：\`merge\`发生冲突时☞撤销merge
     *  场景5：\`merge\`发生冲突时☞解决冲突
     *  场景6：\`版本V0118分支\`开发到一定阶段时，把\`版本release分支\`回合到\`版本V0118分支\`

--------------------

`git merge`

在`本地release分支`执行 `git merge` 时，git会把 `refs/remotes/origin/release分支`合并到 `refs/heads/release分支`上

--------------------

### 场景1：本地分支间合并 ###

git merge dev           在master分支执行该命令,则把dev分支内容merge到master分支上

### 场景2：远程release分支合并到本地dev分支 ###

--------------------------------------
    方式1：最省事方式
    --------------------------------------
    1. git checkout dev
    2. git pull
    
    1. git checkout dev
    2. git fetch
    3. git merge
    
    --------------------------------------
    方式2：最省事+最严谨+最高效
    --------------------------------------
    1. git checkout dev
    2. git pull origin release
    
    1. git checkout dev
    2. git fetch origin release
    3. git merge origin/release
    
    1. git checkout dev
    2. git fetch origin
    3. git merge origin/release
    
    --------------------------------------
    方式3：基于本地分支之间merge
    --------------------------------------
    1. git checkout release
    2. git pull
    3. git checkout dev
    4. git merge release
    
    --------------------------------------
    方式4：主要需知道FETCH_HEAD含义，此方法太浪仅做了解即可
    --------------------------------------
    1. git checkout dev
    2. git fetch origin release
    3. git merge FETCH_HEAD

### 场景3：`git merge origin master`和`git merge origin/master`的区别 ###

1. git checkout dev
    2. git fetch origin master
    3. git merge origin release           把origin/master分支，heads/release分支 merge 到 heads/dev
    
    1. git checkout dev
    2. git fetch origin master
    3. git merge origin/master release    把origin/master分支 merge 到 heads/dev

**参考：[git merge origin master和git merge origin/master的区别][git merge origin master_git merge origin_master]**

### 场景4：`merge`发生冲突时☞撤销merge ###

1. git checkout dev
    2. git pull origin release
    3. 发生冲突
    
    git merge --abort
    git reset --hard HEAD
    git reset --hard 8ec554

### 场景5：`merge`发生冲突时☞解决冲突 ###

把origin/release合入本地release分支，然后推送本地release分支到远程仓库
    1. git checkout release
    2. git pull origin release
    3. 本地解决冲突
    4. git add .
    5. git commit -m "Msg"
    6. git push
    
    
    把origin/release合入本地dev分支，然后推送本地dev分支到远程仓库
    1. git checkout dev
    2. git fetch
    3. git merge origin/release
    4. 本地解决冲突
    5. git add .
    6. git commit -m "Msg"
    7. git push

### 场景6：`版本V0118分支`开发到一定阶段时，把`版本release分支`回合到`版本V0118分支` ###

1. git fetch
    2. git checkout -b v0118 origin/release
    3. date >> 1.txt && git add . && git commit -m "msg"         模拟v0118分支提交业务代码
    
    4.期间远程release分支被合入诸多别的业务模块的代码提交
    5.v0118分支开发到一定阶段时，维护性的把release分支回合到v0118分支
    
    6. git fetch origin release v0118                            fetch两个分支对应远程分支的最新提交
    7. git checkout -b release origin/release                    拉取release分支
    8. git merge origin/v0118                                    v0118分支合入release分支
    9. 解决冲突
    10. git push origin HEAD:v0118                                合入v0118分支的release分支充当远程v0118分支
    
    以上操作好处：可保护好提交历史（超神推荐）

**参考：[git push origin HEAD:refs/for/master 的意思][git push origin HEAD_refs_for_master]**

--------------------

**拓展：[Git常用命令汇总][Git]**

[git merge origin master_git merge origin_master]: https://blog.csdn.net/lansetudou/article/details/116841262
[git push origin HEAD_refs_for_master]: https://blog.csdn.net/u010312474/article/details/107915694
[Git]: https://blog.csdn.net/weixin_37646636/article/details/129778632