embiggen git section authored by Malin Freeborn's avatar Malin Freeborn
...@@ -16,7 +16,6 @@ Notes on the game's design. ...@@ -16,7 +16,6 @@ Notes on the game's design.
## Git ## Git
- [My git workflow](dev/git)
- [FOSS development](dev/foss) - [FOSS development](dev/foss)
### BIND.9 ### BIND.9
...@@ -28,6 +27,7 @@ So if you want to change the current version and all future versions, do it in t ...@@ -28,6 +27,7 @@ So if you want to change the current version and all future versions, do it in t
And if you want to make changes in the new version only, do it in the `tie` branch. And if you want to make changes in the new version only, do it in the `tie` branch.
Character creation once stayed in the `cc` branch, and later merged into `tie`. Character creation once stayed in the `cc` branch, and later merged into `tie`.
The workflow looks like this:
<div class="center"> <div class="center">
...@@ -61,18 +61,22 @@ gitGraph ...@@ -61,18 +61,22 @@ gitGraph
checkout cc checkout cc
commit commit
commit commit
checkout dev
commit commit
checkout tie checkout tie
merge cc merge cc
merge dev
commit commit
commit commit
``` ```
<!-- Branches overview:
- `master` requires a manual formatting check, because LaTeX isn't reliable. Once something goes to the master branch, it gets published automatically.
- `img` allows 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.
- `img` allows images to get a double check before entering the git history. - `tie` is for anything for BIND 0.9.
--> - Anything else goes in its own branch.
- `master` requires a manual formatting check.
</div> </div>
... ...
......