Copyleft/guide Changeset - be0abd7b1e18

Changeset - be0abd7b1e18

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Bradley Kuhn (bkuhn) - 7 years ago 2016-10-25 22:34:29
bkuhn@ebb.org

Document the One Rule for merging into master.

1 file changed with 28 insertions and 1 deletions:

CONTRIBUTING.md

0 comments (0 inline, 0 general)

CONTRIBUTING.md

➞

Show inline comments

@@ ... / @@ -172,13 +172,15 @@ However, merge requests and/or patches against @@
 ['master' branch](https://k.copyleft.org/guide/changelog?branch=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'.
 replace 'next' everywhere below with 'master'.  However, please read below
 the section entitled "Why Changes Should Target 'next' Branch" below before
 pushing anything to the master branch.
 ### Contributing via copyleft.org's Kallithea instance
 First-time contributors may want to do the following four items first:
@@ ... / @@ -281,12 +283,37 @@ request. @@
    web interface, for larger changes, it may be worthwhile to start a thread
    on
    [the mailing list](http://lists.copyleft.org/cgi-bin/mailman/listinfo/discuss)
    about the merge request.  Include the URL of the merge request in the
    post.
 ## Why Changes Should Target 'next' Branch
 The instructions above encourage you to submit your changes to the 'next'
 branch, which is found
 [on k.copyleft.org](https://k.copyleft.org/guide/files/next), and is
 auto-deployed to
 [copyleft.org/guide-next/](https://copyleft.org/guide-next/).
 The "official" Copyleft Guide is published on
 [copyleft.org/guide/](https://copyleft.org/guide/) automatically from the
 'master' branch of the repository.
 Since many use this Guide as a reference, non-trivial changes are merged into
 the "official" Copyleft Guide carefully and only after
 discussion on
 [the mailing list](http://lists.copyleft.org/cgi-bin/mailman/listinfo/discuss).
 There is one key rule with regard to merging changes from 'next' to 'master':
 > Treat 'master' branch as if by committing there, you have single-handledly
 > defined for the world what copyleft is.
 If you have commit access to the public master branch, please carefully head
 this.
 ## Gitorious Apocalypse Recovery
 If you used to contribute via Gitorious, *don't panic*!  We were careful to
 transition the project to Kallithea without requiring recloning the
 repository.  If you initially did a clone of the main repository (i.e., not
 your own clone) all you need to do one of these operations

0 comments (0 inline, 0 general)