Branches and Tags

As described on the Working with Upstream page, branches and tags from the upstream Sealog server repo are automatically mirrored here with the upstream/ prefix.

Master branch

The master branch should always be ready to deploy on a cruise. All changes to this branch should be tested and, ideally, reviewed by a second person.

Cruise branches

During mobilization, create a new branch off of master with the format cruise/<cruise id>:

$ git checkout -b cruise/AT42-12

As code is changed, make commits only to this branch. At the conclusion of the cruise, regardless of whether there were changes, push the branch:

$ git push origin cruise/AT42-12