Changeset - 81157b31366a
[Not reviewed]
0 1 0
Bradley Kuhn (bkuhn) - 9 years ago 2014-12-21 00:31:57
bkuhn@ebb.org
No instructions for 'master';just note possibility

Ultimately, users will probably pick either 'master' or 'next' to submit
changes anyway, so just leave the instructions to refer to 'next' and
note that they could replace 'next' with 'master'.
1 file changed with 4 insertions and 1 deletions:
0 comments (0 inline, 0 general)
CONTRIBUTING.md
Show inline comments
...
 
@@ -83,12 +83,16 @@ 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.
 

	
 
To use the instructions below for proposals against the 'master' branch, just
 
replace 'next' everywhere below with 'master'.
 

	
 

	
 
### Contributing via Gitorious
 

	
 
First-time contributors may want to do the following four items first:
 

	
 
0. [Create an account on Gitorious](https://gitorious.org/users/new)
 

	
...
 
@@ -110,13 +114,12 @@ First-time contributors may want to do the following four items first:
 

	
 
3. Now, add to your clone a copy of the "real" Conservancy policies
 
   repository, and make a branch that tracks the official version:
 

	
 
        $ git remote add copyleft-tutorial-official git@gitorious.org:copyleft-org/tutorial.git
 
        $ git fetch copyleft-tutorial-official
 
        $ git branch --track official-master copyleft-tutorial-official/master
 
        $ git branch --track official-next copyleft-tutorial-official/next
 

	
 
That completes the first-time setup.  Next is a workflow each proposed merge
 
request.
 

	
 
0. First, ensure the Git repository points at the right branch and all old
0 comments (0 inline, 0 general)