目标:[baseBranch, branch2.0, branch2.1, branch2.2] -> [baseBranch, branch2]
# 当前所在分支: branch2.0
1. git rebase -i [baseBranch 的commit ID]
2. vim 操作
# 批量替换::%s/pick/s/g
r branch2.0 # r 修改,pick 保留也是OK的(如果不想修改的话)
s branch2.1
s branch2.2
....
s branch2.x
3. git push origin branch2.0 -f
4. git pull origin master:master # 或者 git fetch origin master
5. git rebase master
6. git checkout master
7. git merge branch2.0