Page History

...

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. 

1. Changing from SNAPSHOT version to release version. Something like [maven-release-plugin] prepare release $REPO-$CURR
2. 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.

...

#For vivo, vitro, vivo languages, vitro languages, jenatools, and orcid-api-client
#Needs to be completed for each project in release
#Example orcid-api-client-0.6.3 would become rel-0.6-maint


git push origin rel-${CURR}-RC:rel-${CURR[major.minor]}-maint

Merge into '

...

main' branch

#For vivo and vitro the main branch was previously develop but is developnow "main"
#For vivo languages, vitro languages, jenatools, and orcid-api-client the main branch is was master but is now "main"
#Needs to be completed for each project in release


git checkout main
git pull
git checkout rel-${CURR}-RC
git rebase -i main
git push origin main

or

git # git checkout rel-${CURR}-RC
git checkout main
git pull
git merge heads/rel-${CURR}-RC
git push origin main

...