- Fork the repo
- Make commits to your branch. Begin each commit with a present tense verb.
- When you've finished with your fix or feature, submit a pull request directly to master. Include a description of your changes.
- 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.
- Fix any issues raised by your code reviwer, and push your fixes as a single new commit.
- Once the pull request has been reviewed, it will be merged by another member of the team. Do not merge your own commits.
Use github’s interface to make a fork of the repo, then add that repo as an upstream remote:
git remote add upstream https://github.com/hackreactor-labs/<NAME_OF_REPO>.git
These commands will help you do this:
# Creates your branch and brings you there
git checkout -b `your-branch-name`Make changes and commits on your branch, and make sure that you only make changes that are relevant to this branch. If you find yourself making unrelated changes, make a new branch for those changes.
- Commit messages should be written in the present tense; e.g. "Fix continuous integration script".
- The first line of your commit message should be a brief summary of what the commit changes. Aim for about 70 characters max. Remember: This is a summary, not a detailed description of everything that changed.
- If you want to explain the commit in more depth, following the first line should be a blank line and then a more detailed description of the commit. This can be as detailed as you want, so dig into details here and keep the first line short.
Make a clear pull request from your fork and branch to the upstream master branch, detailing exactly what changes you made and what feature this should add. The clearer your pull request is the faster you can get your changes incorporated into this repo.
At least one other person MUST give your changes a code review, and once they are satisfied they will merge your changes into upstream. Alternatively, they may have some requested changes. You should make more commits to your branch to fix these, then follow this process again from rebasing onwards.
Once you get back here, make a comment requesting further review and someone will look at your code again. If they like it, it will get merged, else, just repeat again.
Thanks for contributing!
Uphold the current code standard:
- Keep your code [DRY][http://en.wikipedia.org/wiki/Don't_repeat_yourself].
- Apply the [boy scout rule][http://programmer.97things.oreilly.com/wiki/index.php/The_Boy_Scout_Rule].
- Follow STYLE-GUIDE.md
This is just to help you organize your process
- Did I cut my work branch off of master (don't cut new branches from existing feature brances)?
- Did I follow the correct naming convention for my branch?
- Is my branch focused on a single main change?
- Do all of my changes directly relate to this change?
- Did I write a clear pull request message detailing what changes I made?
- Did I get a code review?
- Did I make any requested changes from that code review?
If you follow all of these guidelines and make good changes, you should have no problem getting your changes merged in.