From 71c4a749744efec809df66976f111d023fdb58c1 Mon Sep 17 00:00:00 2001 From: "Bradley M. Kuhn" Date: Sun, 16 Nov 2014 11:53:35 -0500 Subject: [PATCH] Begin section on merge/patch workflow. --- CONTRIBUTING.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bca035b..ac63ebb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -56,3 +56,12 @@ them are writing, and some of them are formatting-related. There is also a [TODO list on the website](https://copyleft.org/todo/), which are mostly related to formatting, layout and infrastructure, but if you'd like to help there, such help is also welcome. + +## Merge Request and Patch Workflow + +Currently, the main location for work on this project is Gitorious, and +active new development on the project happens on the 'next' branch. Here is +a suggested workflow for submitting patches — first doing so *with* +the Gitorious infrastructure and second *avoiding* the Gitorious +infrastructure. +