git commond —— git merge —— 模拟某次 merge 操作

需要模拟的merge

Commit: f94551acfbd3be6d558ebf0f6df8031e72fb7c17
Parents: b91641a9db44dff81e0f86bcde3a3f29dee5f4f7, 7e0ee6b26f66149d50f1f1d927d0dae0cbe9ff5a
Author: 123
Committer: 123 
Date: Thu Dec 09 2021 14:10:22 GMT+0800 (中国标准时间) 

 

模拟上述 merge操作：

在 b91641a9db44dff81e0f86bcde3a3f29dee5f4f7 上创建新分支 ，merge commit：7e0ee6b26f66149d50f1f1d927d0dae0cbe9ff5a

 

$ git branch v3.3_common_adjust_13 b91641a9db44dff81e0f86bcde3a3f29dee5f4f7

$ git checkout v3.3_common_adjust_13


$ git merge  7e0ee6b26f66149d50f1f1d927d0dae0cbe9ff5a

# 解决完冲突

$ git status
On branch v3.3_common_adjust_13
You have unmerged paths.