git merge 分支

把master merge到apple_campus
1.git stash
2.git checkout master
3.git pull
4.git checkout apple_campus
5.git pull
6.git merge master
7.git gui #解决冲突,再重新提交
8.git stash pop

 

6. git rebase -i origin/delevep

7. git push -f origin issue