ChiliProject is not maintained anymore. Please be advised that there will be no more updates.
We do not recommend that you setup new ChiliProject instances and we urge all existing users to migrate their data to a maintained system, e.g. Redmine. We will provide a migration script later. In the meantime, you can use the instructions by Christian Daehn.
The ChiliProject Repository¶
The main ChiliProject is hosted on GitHub: https://github.com/chiliproject/chiliprojectThe individual developers' repositories are:
- Felix Schäfer: https://github.com/thegcat/chiliproject
Branch Naming Convention¶
The ChiliProject repository has 3 main long lived branches;
unstable. Additional short-lived branches will be present from time to time.
This branch will only contain released versions and should be safe for use in production
This branch contains the latest stable version plus bugfixes/non-breaking changes that will be included in the next version. It should be pretty stable but not as stable as
stable. All development should start from here and
release branches should be created from here.
This branch is the integration branch for the next major release, it contains a reasonably recent version of
master plus feature branches from the developer repositories. New feature development should be branched off from here or if there is pending work that has not yet been merged to
master. The goal of this branch is to merge all feature branches together to prepare the next major release, when the code on this branch is stable enough, it is merged to
master just prior to release.
Short-lived release branches are created off of
master prior to release for final tests, documentation, version bumps. Those are named
release- followed by the version tag as per SemVerTag, for example
release-v1.1.2. If some intermediate versions are needed before fully releasing, for example Release Candidates, those versions should be git tagged accordingly, for example
v1.1.2-RC1, no new branch or merging is necessary at that point. When the code is ready to release, the branch is merged into the
stable branch, the merge commit tagged accordingly (
v1.1.2), after that the branch should also be merged back into
master to get last-minute fixes into master, the branch can then be deleted.
stable is more stable than
master which is more stable than