[gimp-web/git-workflow-page] Writing a bit more to git-workflow.md



commit 79350d95ac3807abbe0aa34931d542812ebb426f
Author: Pat David <pat patdavid net>
Date:   Mon Nov 23 22:04:33 2015 -0600

    Writing a bit more to git-workflow.md

 content/about/meta/git-workflow.md |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/content/about/meta/git-workflow.md b/content/about/meta/git-workflow.md
index 4f4821b..1d9b854 100644
--- a/content/about/meta/git-workflow.md
+++ b/content/about/meta/git-workflow.md
@@ -18,3 +18,14 @@ To access this testing branch publicly:
 <https://testing.gimp.org> or <http://testing.gimp.org>
 
 
+
+## Branches
+
+There are two main branches we are working with.
+Well, mainly *one* branch that is worked with mostly and another that is actually the main site.
+
+The **master** branch will build to the full [www.gimp.org](//www.gimp.org).
+
+The **testing** branch will build to [testing.gimp.org](//testing.gimp.org).
+This is the main branch for testing things out and checking that they will build correctly on the server.
+Once a change works here ok, it can then be merged into **master** and pushed to the server.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]