about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMorgan Astra <m@morganastra.me>2018-11-14 23:39:53 -0800
committerMorgan Astra <m@morganastra.me>2018-11-14 23:39:53 -0800
commit5cd81135dc572e453939be6b4f95007b8bd65ee1 (patch)
treee312d1e31b0c3f0887cee6724817b2e2d5b182dd
parentf00ebc56b582bea2cfd1911403c342dca9247890 (diff)
Update readme
-rw-r--r--README.md15
1 files changed, 14 insertions, 1 deletions
diff --git a/README.md b/README.md
index a14cd99..d306cc1 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,20 @@ on your own computer by running the following command:
 $ lein ring server
 ```
 
-This will launch a server running the app and open your default web browser to the index page. The server will automatically reload files as you edit them.
+This will launch a server running the app and open your default web browser to 
+the index page. The server will automatically reload files as you edit them -
+with the unfortunate exception of `pronouns.tab`, which is loaded as a resource
+and requires an app restart to reload.
+
+### The git repo
+
+For most of this project's history we had separate `master` and `develop`
+branches but that's proven to be more trouble than it's worth. Going
+forward we'll be doing all development in feature branches off of `master`,
+and PRs should be issued against `master`.
+
+Please follow [this guide](https://chris.beams.io/posts/git-commit/) 
+for writing good commit messages :)
 
 ## Philosophy on pronoun inclusion