master

Contains the "final" version of code. The branch gets updated to match official releases of MP2

Changes from dev branch will be merged in here by the MP2 lead developer for releases. Usually no direct commits are done to master.

dev

Contains all tested and working code changes.

Once feature branches are complete and tested, they get rebased and merged into dev. Usually no direct commits are done to dev.

weekly

Contains merged branches for testing purposes. Builds of this branch will be published to forum.

Changes are merged from other feature branches, can be reverted, rebased, or branch might be recreated completely after some time.

feature branches

Development of individual features (or bugfixes) happens in own branches.

For each new feature there should be a JIRA-ticket to document the purpose and state of development.