note ods impending doom authored by Malin Freeborn's avatar Malin Freeborn
......@@ -17,16 +17,15 @@ title: Current Git Workflow
---
%%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'showBranches': true, 'showCommitLabel':true,'mainBranchName': 'master'}} }%%
gitGraph
commit
branch ods
commit
branch dev
commit
branch run
checkout dev
commit
commit
branch cc
checkout cc
branch skills
checkout skills
commit
commit
checkout dev
......@@ -36,12 +35,12 @@ gitGraph
checkout dev
commit
checkout run
merge cc
merge skills
merge dev
checkout cc
checkout skills
commit
checkout dev
merge cc
merge skills
checkout master
merge dev
......@@ -53,7 +52,7 @@ gitGraph
- `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.
- `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 for online play. This is seriously out-of-date, and I will probably just delete that ods file soon, because BIND does not work well with online games.
- Anything else goes in its own branch.
### General Structure
......
......