Workflow

This project will have several required workflow aspects, to ensure minimal conflicts and

Each user will create a branch from master, in the same repo, with the following name: "(Team).devbranch_(Username)". This will ensure code is easily identifiable. From there, you are free to make as many commits as you want, and comment on each other's code.

When you feel like your code is ready for deployment (this doesn't mean you've written the whole thing, just a meaningful addition without major bugs) create a pull request from your branch to your team's devbranch. At this point, other people will come by and critique it. If there are any problems, fix them and resubmit the PR. If not, woohoo your code is merged to your team's devbranch. At this point, it will undergo testing to ensure it works, and then a pull request will be created to merge devbranch with master. From the master, every once in a while we will push stable updates to the production branch, which is saved as the latest release candidate. Once the project is sufficiently underway, the production branch will be pushed to a server to host the website.

Always keep an eye out on what others are doing, and do your best to look over other people's code when they create pull requests, an comment any ideas or problems you find. As always, if you have any questions do feel free to contact anyone on the mod team, or the community managers.

There is a useful page here that features a very similar workflow to what we will use, apart from how users will create branches from their team's branch, rather than the main branch.

Bear in mind, this is subject to change as the project goes on and we become more efficient at doing this.