Project

General

Profile

Contributing » History » Version 6

Joseph Spiros, 07/06/2011 06:00 PM

1 1 Joseph Spiros
h1. Contributing
2
3
If you would like to contribute to Philo, thank you! However, there are some things you must know first.
4
5 4 Joseph Spiros
h2. Branches and Code Style
6
7 6 Joseph Spiros
We use "_A successful Git branching model_":http://nvie.com/posts/a-successful-git-branching-model/ with the blessed repository. To make things easier, you probably should too. This means that you should work on and against the develop branch in most cases, and leave it to the release manager to create the commits on the master branch if and when necessary. Regardless of what you do, the release manager will usually merge your changes into the develop branch unless you explicitly note they should be treated otherwise.
8 4 Joseph Spiros
9
h2. Licensing and Legal
10
11 5 Joseph Spiros
In order for the release manager to merge your changes into the blessed repository, you will need to submit a signed CLA. Our CLAs are based on the Apache Software Foundation's CLAs, which is the same source as "the Django Project's CLAs":https://www.djangoproject.com/foundation/cla/. You might, therefore, find "the Django Project's CLA FAQ":https://www.djangoproject.com/foundation/cla/faq/. helpful.
12 4 Joseph Spiros
13
If you are an individual not doing work for an employer, then you can simply submit the Individual CLA (attachment:ithinksw-icla.txt).
14 1 Joseph Spiros
15 5 Joseph Spiros
If you are doing work for an employer, they will need to submit the Corporate CLA (attachment:ithinksw-ccla.txt) and you will need to submit the Individual CLA (attachment:ithinksw-icla.txt) as well.
16
17
Both documents include information on how to submit them.