Removed stale link authored by Tyler Collins's avatar Tyler Collins
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
2. All development should be made on the dev branch. 2. All development should be made on the dev branch.
3. The development branch itself should not be pushed to and instead should be pulled into. 3. The development branch itself should not be pushed to and instead should be pulled into.
4. Development for features, or style should be made to a new branch based off the development branch then pushed to a branch upstream. 4. Development for features, or style should be made to a new branch based off the development branch then pushed to a branch upstream.
* You may make pull requests to master for bug fixes that your replicate in dev * You may make pull requests to master for bug fixes that you replicate in dev
5. The branch upstream should then be pulled through the web interface using a pull request. 5. The branch upstream should then be pulled through the web interface using a pull request.
* You should squash your commits into one commit * You should squash your commits into one commit
6. Once thoroughly tested the development branch should be pulled into the master. 6. Once thoroughly tested, the development branch should be pulled into master.
## For example ## For example
1. `git checkout dev` 1. `git checkout dev`
2. `git checkout -b <your name>-<your feature name>` 2. `git checkout -b <your name>-<your feature name>`
... ...
......