1. On Bamboo, change openboxes-release back to master

    Change Linked Repo

  2. Merge master into develop

    git checkout develop
    git merge master
    # fix conflicts
    git push
  3. Bump version (if major/minor release)

    # bump version number in
    git add
    git commit -m "bumped app version to x.y.z+1-SNAPSHOT"
    git push
  4. Delete release/x.y.z branch

    git branch -d release/x.y.z
  5. ... everybody do your share