clean up git setup authored by Malin Freeborn's avatar Malin Freeborn
## For Witches
# Gitcraft
>>>
A good witch commits her spells to a book, and shares them freely.
......@@ -6,7 +6,7 @@ Check the image below, and note the basic `water` sigil at the root.
Soon after, the spell changes, but the book tracks the changes, and every version of the spell.
Moving up the tree, you can see this spell split into two versions, so the witch could access both at any time.
Moving up the tree, you can see this spell splits into two versions, so the witch could access both at any time.
These splits sometimes happen when witches try variations on a spell, and sometimes they happen because of witches sharing spells, and each making their own changes.
The most powerful spells combine different elements together, so the final commit joins both sigils into one, merging the features of both spells into each other, and creating something more powerful.
......@@ -16,7 +16,7 @@ This way of sharing knowledge began shortly after the dawn of time, and has rema
![Gitcraft](gitcraft.svg)
## For Normies
# Praxis
If you modify a weapon and someone else adds a spell, nobody wants to deal with merging those two ideas together. Git puts your changes together for you.
......@@ -27,9 +27,9 @@ If you have an idea, but you want to show it to someone before committing to it,
Make a new branch to play with, and name it something (in this example, your username).
```bash
git switch -c $USER
git branch $USER
git checkout $USER
```
You can mess around here, making the changes you want.
But if you don't like your changes, just reset everything:
......@@ -54,4 +54,8 @@ Push your changes to gitlab, so everyone sees them.
```bash
git push origin $USER
```
Remember you are pushing your own branch, so replace 'new' with whatever name you gave your branch.
Remember you are pushing your own branch, so replace `$USER` with a good name for your branch.
> Names have power, and should never be treated lightly.
- *Paladin Torvald (or was it Le Guin?)*