Skip to content

Commit

Permalink
Update README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
rbs333 authored May 5, 2019
1 parent 85da573 commit 064d69d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ A Waitress production server can be started by `python production.py`.
- Never push to master
- Don't work on a feature on an isolated branch for an entire semester
- - Make consistent pull request to keep master from falling to far behind
- - This will create reduce merge conflicts in the future
- - This will reduce merge conflicts in the future

## Adding a new feature
- Start on master branch if on a different branch `git checkout master`
Expand Down

0 comments on commit 064d69d

Please sign in to comment.