home.md

@@ -23,12 +23,8 @@ Notes on the game's design.
 ### BIND.9
 
 The next version will be BIND 0.9, which will involve a lot of changes.
-The new version will allow dice-rolls to tie, so the branch is called `tie`.
+Right now, all projects use the `dev` branch, and nothing will merge with master until everything merges together.
 
-So if you want to change the current version and all future versions, do it in the `dev` 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`.
 The workflow looks like this:
 
 
@@ -38,25 +34,21 @@ title: Current Git Workflow
 ---
 %%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'showBranches': true, 'showCommitLabel':true,'mainBranchName': 'master'}} }%%
 gitGraph
-   commit
    branch dev
    checkout dev
    commit
    commit
-   branch tie
-   checkout tie
    commit
    commit
    checkout master
    merge dev
-   checkout tie
-   merge dev
+   checkout dev
    commit
    commit
    branch img
    checkout img
    commit
-   checkout tie
+   checkout dev
    branch cc
    checkout cc
    commit
@@ -64,8 +56,7 @@ gitGraph
    checkout dev
    commit
    commit
-   checkout tie
-   merge cc
+   checkout cc
    merge dev
    commit
    commit
@@ -76,7 +67,6 @@ 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` 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.
-- `tie` is for anything for BIND 0.9.
 - Anything else goes in its own branch.
 
 ### General Structure
@@ -102,7 +92,7 @@ BIND 0.9 radically changes the structure, with a more zine-like format, splittin
     * Interesting plants?
     * Making rulings
     * Handing out XP
-- Magic
+- **Magic**
     * High-level spells
     * Making your own spells.
     * Potions.