`合并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`