diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-01-12 16:23:26 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-01-12 16:23:26 +0100 |
| commit | 45a8afaabc6d09ad59bbb3c89a6cdfe8cbc3312c (patch) | |
| tree | 7ca4207099f9225b5ef74b31f48627a282e7fdf2 /contributing.md | |
| parent | cd94dd7e1d8969658810ccc4158a75d2936d0a44 (diff) | |
| parent | 934d6d9797f4dadd4e4d05b12bc4d7309fedb6c3 (diff) | |
Merge branch 'develop' into feature/session
Diffstat (limited to 'contributing.md')
| -rw-r--r-- | contributing.md | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/contributing.md b/contributing.md index 99ed85909..5a25698bf 100644 --- a/contributing.md +++ b/contributing.md @@ -29,9 +29,10 @@ If you change anything that requires a change to documentation then you will nee ### Compatibility -CodeIgniter is compatible with PHP 5.2.4 so all code supplied must stick to -this requirement. If PHP 5.3 or 5.4 functions or features are used then there -must be a fallback for PHP 5.2.4. +CodeIgniter recommends PHP 5.4 or newer to be used, but it should be +compatible with PHP 5.2.4 so all code supplied must stick to this +requirement. If PHP 5.3 (and above) functions or features are used then +there must be a fallback for PHP 5.2.4. ### Branching @@ -79,7 +80,9 @@ Hard way The best way to contribute is to "clone" your fork of CodeIgniter to yo The Reactor Engineers will now be alerted about the change and at least one of the team will respond. If your change fails to meet the guidelines it will be bounced, or feedback will be provided to help you improve it. -Once the Reactor Engineer handling your pull request is happy with it they will merge it into develop and your patch will be part of the next release. Keeping your fork up-to-date +Once the Reactor Engineer handling your pull request is happy with it they will merge it into develop and your patch will be part of the next release. + +### Keeping your fork up-to-date Unlike systems like Subversion, Git can have multiple remotes. A remote is the name for a URL of a Git repository. By default your fork will have a remote named "origin" which points to your fork, but you can add another remote named "codeigniter" which points to `git://github.com/bcit-ci/CodeIgniter.git`. This is a read-only remote but you can pull from this develop branch to update your own. |