Branch Management

There are four relevant branches in the Talos product development cycle.

• production
• master
• dev
• daily-dev

IMPORTANT: Commits are never to be made directly to dev, master, or production.

Ideally, once per week each is rolled onto the next (daily-dev to dev, dev to master, and so forth). The rolling out takes place in reverse order:

1. master >> production
2. dev >> master
3. daily-dev >> dev

Frequent backwards compatibility merges to daily-dev are highly encouraged.

REMINDERS:

• Always let the test complete for a merge before moving onto the next one
• Do a release always from master once merged
• Test pip install talos and pip install -U talos once production merge completed