Skip to content

Commit

Permalink
#5 Split docs into Open and Custom Edition
Browse files Browse the repository at this point in the history
  • Loading branch information
groganz committed Jul 16, 2016
1 parent 8776fcb commit aac1e2d
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion open/developer/book/contribute.rst
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ How to Create a Branch?
If you are not familiar with Git and branching, please read the introduction
`Basic Branching and Merging`_.

The name of the branch should include ``campaignchain-`` and the number of the
related issue, such as ``campaignchain-42``.

Inline Alias in composer.json
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down Expand Up @@ -114,6 +117,15 @@ Please modify the :ref:`sample data <dev-book-contribute-sample-data>` according
by changing existing fixtures or by adding those which allow others to test new
features.

Branching Model
~~~~~~~~~~~~~~~

We structure the flow of our development às follows:

* The ``master`` branch holds the latest stable code.
* New features are being developed in separate branches.
* Release branches hold the code of the tagged ``master` branch.
.. _dev-book-contribute-sample-data:
Sample Data
Expand All @@ -137,7 +149,7 @@ Please add a ``LICENSE`` file with the `content of the Apache License`_ into the
root of new packages that you want to be included as part of the CampaignChain
Open Edition.

The below license block has to be present at the top of every file:
The below license block has to be present at the top of every file.

In PHP before the namespace:

Expand Down

0 comments on commit aac1e2d

Please sign in to comment.