git merge

https://blog.youkuaiyun.com/baidu_31333625/article/details/80767680

// 确保要合入的分支现在与远程同步并保持最新
// 假设开发使用dev 要合入master
git checkout dev
git pull 
git checkout master
git pull 
git merge dev
git commit -m "XXX merge"
git push origin master