Merge pull request #2317 from GPCsolutions/contributing

Added branches information to contributing guidelines
This commit is contained in:
Laurent Destailleur 2015-02-03 13:44:43 +01:00
commit 6d751ad63b

View File

@ -13,10 +13,25 @@ Issues are tracked at [Doliforge](https://doliforge.org/projects/dolibarr)
Code Code
---- ----
### Basic workflow
1. Fork the [GitHub repository](https://github.com/Dolibarr/dolibarr). 1. Fork the [GitHub repository](https://github.com/Dolibarr/dolibarr).
2. Clone your fork. 2. Clone your fork.
3. Commit and push your changes. 3. Choose a branch(See the Branches section below).
4. Make a pull request. 4. Commit and push your changes.
5. Make a pull request.
### Branches
Unless you're fixing a bug, all pull request should be made against the *develop* branch.
If you're fixing a bug, it is preferred that you cook your fix and pull request it
against the oldest version affected that's still supported.
We officially support versions N, N − 1 and N − 2 for N the latest version available.
Choose your base branch accordingly.
### General rules ### General rules
Please don't edit the ChangeLog file. A project manager will update it from your commit messages. Please don't edit the ChangeLog file. A project manager will update it from your commit messages.