Commit 79350d95 authored by Pat David's avatar Pat David
Browse files

Writing a bit more to git-workflow.md

parent 7ac7d4f4
......@@ -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.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment