Skip to content
Jacob Viau edited this page Oct 22, 2013 · 5 revisions

##Pull Requests##

Pull requests require approval of two other team members. First team member should comment their approval (or any issues) on the request. Second member can then allow the merge if the first has approved.

Pull requests should mention the issue they are addressing. Github makes this easy by adding the issue number in the commit message and pull request title with a '#' preceding. (See #10 for example).

##Forks## Everyone has their own fork of the repo. If you need someone's changes before they're merged into the main repo, just git fetch $NAME and git merge $NAME/$BRANCH to continue working.

To get the remote repos set up right, follow the handy repository set up guide here.

##Testing## All commits with functioning code should be accompanied by unit tests at the minimum. The test project is yet to be set up.

If you are testing a class that depends on a service, I suggest using Mockito. This will allow you to stub out that service and prepare expectations and return values for it during unit tests. If you need help learning how to use this ask Jacob.

Clone this wiki locally