Branches

• main
  • Live version. Always in a working state. Merged into from stable.
• stable
  • Staged version. Always in a working state. Merged into from unstable or from a solid feature branch.
• unstable
  • Staged version. May not always be in 100%-working state but mostly. Merged into from feature branches.
• feature branches
  • Unstaged version. Not guaranteed to be working. Be sure to periodically check comparison to stable to check for needed updates.

1. Merge feature branch into unstable.
2. Merge unstable into stable when in a working state.
3. Merge stable into main when to be pushed to Live.
4. git pull when pushing to Live.