1、更新涉及的本地所有分支:master/develop/qa
git checkout master
git pull
git checkout qa
git pull
git checkout develop
git pull
2、升级版本号
external.atlassian.jgitflow:jgitflow-maven-plugin:release-start external.atlassian.jgitflow:jgitflow-maven-plugin:release-finish -DreleaseVersion=x.x.x.x -DdevelopmentVersion=x.x.x.x-SNAPSHOT -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
3、提交发布版到master并打标签
git checkout master
git push origin master
git push origin {tag}
4、提交开发版到qa与develop
git checkout develop
git pull
git push
git checkout qa
git pull
git push
(将已改的分支合到没改的分支)
1、如已改成功的分支为develop,而qa分支未改成功:
git checkout qa
git pull origin develop
git push
1、如已改成功的分支为qa,而develop分支未改成功:
git checkout develop
git pull origin qa
git push