diff --git a/README.md b/README.md index 356ced5..a72a04b 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,11 @@ Branch-independent CI runner for the TSHARPS flight training scheduler. ## Branch Model ``` -TestMain ──► TestStaging ──► TestProduction +TestDevelop ──► TestStaging ──► TestProduction (dev) (validate) (live CI) ``` -- **TestMain**: Develop CI changes here +- **TestDevelop**: Develop CI changes here - **TestStaging**: Validate before going live - **TestProduction**: Runs against ALL TSHARPS branches on every push @@ -43,14 +43,14 @@ TestMain ──► TestStaging ──► TestProduction ## Promoting CI Changes ```bash -# 1. Develop on TestMain -git checkout TestMain +# 1. Develop on TestDevelop +git checkout TestDevelop # make changes git commit -am "add new check" -git push origin TestMain +git push origin TestDevelop # 2. Promote to TestStaging -git checkout TestStaging && git merge TestMain && git push +git checkout TestStaging && git merge TestDevelop && git push # 3. Promote to live git checkout TestProduction && git merge TestStaging && git push