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.
These are standards on how we use git. For more information about the repository layout see ChiliProject Repository
Each developer should work in their own personal repository for any bug fixes or features. Once the code is ready, a ChiliProject committer will review it and merge it into the correct branch in the ChiliProject Repository. Make sure to leave your branches around until they are completely merged.
When referencing an issue, prefix the first line of the comment with the issue number in brackets:
[#123] Fixing something
If there are multiple issues, list each number inside of one set of brackets:
[#123 #456] Fixing two things....
TODO: need to research if this is needed?
Unless you are working in a completely separate branch, don't rebase.
Commits will need to be cherry picked from other branches and repositories on occasion.
Working with upstream repositories¶
TODO: git-svn, Redmine