版权声明:如需转载,请注明出处 https://blog.csdn.net/zr15829039341/article/details/83009406
在开发的分支feature上 git pull
git checkout server/qa 或者 git checkout server/dev
git pull
git merge feature 合并到qa/dev上 解决冲突
npm run build
git add .
git commit -m 'build,merge'
git push