基于基线版本新建分支，并合并之前未合并到基线版本的分支

2019独角兽企业重金招聘Python工程师标准>>>

`合并feature2到feature5继续开发

git checkout -b feature2 origin/feature2

git pull

git checkout -b baseline origin/baseline

git pull

git checkout -b feature5

git merge feature2

解决冲突

git add .

git commit -m "merge private-cloud-statistics to picc_1130"

git push origin feature5`

转载于:https://my.oschina.net/duo8523/blog/2247186