Skip to content

Commit

Permalink
Merge branch 'master' into locate-msbuild
Browse files Browse the repository at this point in the history
  • Loading branch information
@DustinCampbell
DustinCampbell authored Oct 25, 2017
2 parents a9388da + b27e083 commit 8f1a4d2
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ Before contributing any feature, make sure to discuss it upfront with the team -

## Workflow

* We use the `dev` branch for active development. All pull requests should be made to this branch.
* The `master` branch is normally updated only by merging `dev` branch into it. The only time pull requests can be opened into `master` directly, is in case of hotfixes.
* We use the `master` branch for active development. All pull requests should be made to this branch.
* Tests need to be provided for every bug/feature that is completed.

0 comments on commit 8f1a4d2

Please sign in to comment.