Changeset - 57e8fa1cb2d7
[Not reviewed]
0 1 0
Bradley Kuhn (bkuhn) - 9 years ago 2014-12-21 00:31:57
bkuhn@ebb.org
Note merge request should usually target next.

Some targets to master are acceptable, though.
1 file changed with 11 insertions and 2 deletions:
0 comments (0 inline, 0 general)
CONTRIBUTING.md
Show inline comments
...
 
@@ -65,15 +65,24 @@ 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
 
[on Gitorious](https://gitorious.org/copyleft-org/tutorial), and active new
 
development on the project happens on the
 
['next' branch](https://gitorious.org/copyleft-org/tutorial/source/next:)
 
(which is
 
[auto-published on the copyleft.org/guide-next URL](https://copyleft.org/guide-next/)).
 
Here is a suggested workflow for submitting patches — first doing so
 
*with* the Gitorious infrastructure and second *avoiding* the Gitorious
 
infrastructure.
 
*with* the Gitorious infrastructure, second *avoiding* the Gitorious
 
infrastructure but still using Git, and third avoiding Git altogether.
 

	
 
Merge requests and/or patches against
 
['next' branch](https://gitorious.org/copyleft-org/tutorial/source/next:) are
 
typically much preferred, and the workflow explanations below assume that.
 
However, merge requests and/or patches against
 
['master' branch](https://gitorious.org/copyleft-org/tutorial/source/master:)
 
are not necessarily rejected.  In fact, if your change is a fix for typo,
 
spelling, grammar, formatting or anything urgent, submitting a patch against
 
'master' may make more sense.
 

	
0 comments (0 inline, 0 general)