explain dev branch authored by Malin Freeborn's avatar Malin Freeborn
...@@ -34,6 +34,7 @@ title: Current Git Workflow ...@@ -34,6 +34,7 @@ title: Current Git Workflow
--- ---
%%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'showBranches': true, 'showCommitLabel':true,'mainBranchName': 'master'}} }%% %%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'showBranches': true, 'showCommitLabel':true,'mainBranchName': 'master'}} }%%
gitGraph gitGraph
branch ods
commit commit
branch dev branch dev
branch run branch run
...@@ -64,6 +65,7 @@ gitGraph ...@@ -64,6 +65,7 @@ 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.
- `dev` functions like a master branch, but without the formatting checks. Everything here will eventually go into the master branch.
- `run` only exists to test a pipeline. Anything you put here may be destroyed at any moment with a forced push. - `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.
... ...
......