Skip to content

Commit 8656c3f

Browse files
committed
added sprint tasks and fixed contribution guidelines
1 parent 9dbdfec commit 8656c3f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Diff for: CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
1. Fork the repo
66
1. Cut a namespaced feature branch from master
77
1. Make commits to your feature branch. Prefix each commit like so:
8-
1. When you've finished with your fix or feature, Rebase upstream changes into your branch. submit a pull request directly to master. Include a description of your changes.
8+
1. When you've finished with your fix or feature, Rebase upstream changes into your branch. submit a pull request directly to the development branch. Include a description of your changes.
99
1. Your pull request will be reviewed by another maintainer. The point of code reviews is to help keep the codebase clean and of high quality and, equally as important, to help you grow as a programmer. If your code reviewer requests you make a change you don't understand, ask them why.
1010
1. Fix any issues raised by your code reviwer, and push your fixes as a single new commit.
1111
1. Once the pull request has been reviewed, it will be merged by another member of the team. Do not merge your own commits.
@@ -37,7 +37,7 @@ These commands will help you do this:
3737
git checkout -b `your-branch-name`
3838
```
3939

40-
### Make commits to your feature branch.
40+
### Make commits to your feature branch.
4141

4242
Prefix each commit like so
4343
- (feat) Add a new feature

Diff for: ROADMAP.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
- Set up MySQL/Sequelize in db/mysql directory
1717
- Populate MySQL courses database (API call to Khan Academy)
1818
- Set up Heroku pipelines
19-
- Look into passportjs
19+
- Look into passportjs
2020

2121
## Sprint 2 (MVP) - Wed & Thurs
2222

0 commit comments

Comments
 (0)