From c41a023d4691682cbe7ed4ce497f238969615796 Mon Sep 17 00:00:00 2001 From: jomo Date: Wed, 17 Dec 2014 15:54:14 -0800 Subject: [PATCH] Created About branches (markdown) --- About-branches.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 About-branches.md diff --git a/About-branches.md b/About-branches.md new file mode 100644 index 0000000..62142cc --- /dev/null +++ b/About-branches.md @@ -0,0 +1,10 @@ +# dev +Always use this branch to change code, please test locally before pushing, if possible. + +# master +This branch is used for the production server. +**Never commit into this branch** directly! Only merge stable versions of *dev*: +```bash +git checkout master +git merge dev + ``` \ No newline at end of file