Workflow

Source control

Work directly in fossasia/engelsystem repo.
Sreeja and Dishant work on this repo. Each create a branch for the feature he/she is working on.
We have branch named "staging" to test on test server (Heroku).
We will deploy to Heroku from this "staging" branch.
Master branch will contains the most stable, most finished work.
When you feel the work is done, merge to staging to test (of course you also have to test on your branch first).
When you find something wrong, you have to make the fix on your feature branch, not staging! (then merge to staging again to test).
When you finish a feature, make pull-request to master, so that mentors know when to review your work.
Direction of merging:
- Can merge from your branch to "staging" any time. But never merge from staging to your branch or to master. "Staging" is supposed to be a "minefield", which contains unfinished work.
- Can merge from master to other branches any time to make you up-to-date. Only merge from your branch to master when your work is done.
When contributing to upstream (engelsystem/engelsystem), you make pull-request, with source being your feature branch, not master.
Someone need to keep fossasia/engelsystem master up-to-date with upstream master.

All created issues need to be assigned to one of the 15 milestones.
All created issues need to be assigned to the person working on it.
All PRs need to be associated to an issue.
All PRs need to be assigned to one of the 15 milestones.
All PRs need to be assigned to the person working on it.
All PRs must pass all CI, Tests, Code Coverage, Code Quality.
At the end of the week, the current milestone will close.
All remaining opened issues must be reassigned to the next milestone.
If an issue cannot be completed in less than a day, it should be broken up into multiple issues.
Any unassigned issues and PRs will not be taken in account as part of GSOC.