note run branch authored by Malin Freeborn's avatar Malin Freeborn
...@@ -20,7 +20,7 @@ Notes on the game's design. ...@@ -20,7 +20,7 @@ Notes on the game's design.
- [FOSS development](dev/foss) - [FOSS development](dev/foss)
### BIND.9 ## BIND.9
The next version will be BIND 0.9, which will involve a lot of changes. The next version will be BIND 0.9, which will involve a lot of changes.
Right now, all projects use the `dev` branch, and nothing will merge with master until everything merges together. Right now, all projects use the `dev` branch, and nothing will merge with master until everything merges together.
...@@ -36,6 +36,7 @@ title: Current Git Workflow ...@@ -36,6 +36,7 @@ title: Current Git Workflow
gitGraph gitGraph
commit commit
branch dev branch dev
branch run
checkout dev checkout dev
commit commit
commit commit
...@@ -49,6 +50,8 @@ gitGraph ...@@ -49,6 +50,8 @@ gitGraph
commit commit
checkout dev checkout dev
commit commit
checkout run
merge cc
checkout cc checkout cc
commit commit
checkout dev checkout dev
...@@ -58,9 +61,10 @@ gitGraph ...@@ -58,9 +61,10 @@ gitGraph
``` ```
Branches overview: ### Branches overview:
- `master` requires a manual formatting check, because LaTeX isn't reliable. Once something goes to the master branch, it gets published automatically. - `master` requires a manual formatting check, because LaTeX isn't reliable. Once something goes to the master branch, it gets published automatically.
- `run` only exists to test a pipeline. Anything you put here may be destroyed at any moment with a forced push.
- `img` branches allow images to get a double check before entering the git history. All images have to meet certain [standards](dev/Image-Requirements). - `img` branches allow images to get a double check before entering the git history. All images have to meet certain [standards](dev/Image-Requirements).
- `ods` only exists to update the Character Spreadsheet. - `ods` only exists to update the Character Spreadsheet.
- Anything else goes in its own branch. - Anything else goes in its own branch.
... ...
......