dev/Basic-Git.md

-# Basic Git
+## For Witches
 
-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.
+>>>
+A good witch commits her spells to a book, and shares them freely.
+Check the image below, and note the basic `water` sigil at the root.
 
-If you have an idea, but you want to show it to someone before committing to it, git lets you make a copy of the project, then give someone your copy and your new ideas.  They can then make changes before putting it into the book.
+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.
+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.
+
+This way of sharing knowledge began shortly after the dawn of time, and has remained the default method of crafting clear instructions, to tell the world what you want.
+>>>
 
 ![Gitcraft](gitcraft.svg)
 
+## For Normies
+
+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.
+
+If you have an idea, but you want to show it to someone before committing to it, git lets you make a copy of the project, then give someone your copy and your new ideas.  They can then make changes before putting it into the book.
+
 `git` gives you a lot of toys, but beginners will only need a few:
 
 Make a new branch to play with, and name it something (in this example, your username).