...
Push Release Branch to develop and Maintenance
The release branch has changes made since code freeze. It also contains the update to the version numbers for future development.
...
Ensure that your commit history matches the release branch's commit history, except for the two additional commits.
- Changing from SNAPSHOT version to release version. Something like [maven-release-plugin] prepare release $REPO-$CURR
- Changing from release version to next development version. Something like [maven-release-plugin] prepare for next development iteration
If this appears correct, you can push your release branch on to the maintenance branch.
Push to Maintenance branch
Code Block |
---|
git push origin rel-${CURR}-RC:rel-${CURR[major.minor]}-maint |
Merge into 'develop' branch
Code Block |
---|
git checkout develop git pull git checkout rel-${CURR}-RC git rebase -i develop |
Push to Maintenance branch
Code Block |
---|
git push origin rel-${CURR}-RC:rel-${CURR[major.minor]}-maintdevelop |
Close the release in Jira, and create the next one
...