Cleanup
-
On Bamboo, change openboxes-release back to master
-
Merge master into develop
git checkout develop git merge master # fix conflicts git push
-
Bump version (if major/minor release)
# bump version number in application.properties git add application.properties git commit -m "bumped app version to x.y.z+1-SNAPSHOT" git push
-
Delete release/x.y.z branch
git branch -d release/x.y.z
-
... everybody do your share