Skip to content

Latest commit

 

History

History
185 lines (142 loc) · 7.65 KB

CONTRIBUTING.md

File metadata and controls

185 lines (142 loc) · 7.65 KB
Raw

Contributing

Step-by-step To-Dos for commits

  1. git pull --rebase upstream master (before starting any code changes; skip to next step if you already have made changes)
  2. git checkout -b <branchname> (see below for name format)
  3. do your code changes
  4. git add <your files you want> or git add . if the only changed files are onces you want to add
  5. git commit -m '...'
  6. git pull --rebase upstream master (before pushing)
  7. resolve any conflicts (if any or skip to git push step)
  8. git add . (any changes, do not commit in the middle of a rebase)
  9. git rebase --continue (don't need to commit again)
  10. repeat the resolve/add/continue for each commit that rebase is layering on top.
  11. git push -u origin <branchname> (to your fork)
  12. if your fork:branch already exists, you may hit a conflict and have to delete the branch on the fork and then redo the git push
  13. go to github and create pull request from your fork:repo to team repo:master
  14. ask someone to check your work and merge the PR

dealing with commit rollbacks

git reflog git reset --hard 'HEAD@{X}'

General Workflow

  1. Fork the repo
  2. Cut a namespaced feature branch from master
  3. Make commits to your feature branch. Prefix each commit like so:
  4. 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.
  5. 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.
  6. Fix any issues raised by your code reviwer, and push your fixes as a single new commit.
  7. Once the pull request has been reviewed, it will be merged by another member of the team. Do not merge your own commits.

For the reviewer

  1. First review the code and Rebase/Merge on GitHub
  2. Then visit Heroku and build the review app on staging
  3. Review the app to make sure all functionality is working
  4. If not, notify the contributor and consider rolling back the merged code unless it can be quickly fixed
  5. If it's working, push to Production via the Heroku Pipeline

Detailed Workflow

Fork the repo

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/reactorcore/<NAME_OF_REPO>.git

Cut a namespaced feature branch from master

Your branch should follow this naming convention:

  • bug/...
  • feat/...
  • test/...
  • doc/...
  • refactor/...

These commands will help you do this:

# Creates your branch and brings you there
git checkout -b `your-branch-name`

Make commits to your feature branch.

Prefix each commit like so

  • (feat) Add a new feature
  • (fix) Fix inconsistent tests [Fixes #0]
  • (refactor) ...
  • (cleanup) ...
  • (test) ...
  • (doc) ...

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 Message Guidelines

  • 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.

Rebase upstream changes into your branch

Once you are done making changes, you can begin the process of getting your code merged into the main repo. Step 1 is to rebase upstream changes to the master branch into yours by running this command from your branch:

git pull --rebase upstream master

This will start the rebase process. You must commit all of your changes before doing this. If there are no conflicts, this should just roll all of your changes back on top of the changes from upstream, leading to a nice, clean, linear commit history.

If there are conflicting changes, git will start yelling at you part way through the rebasing process. Git will pause rebasing to allow you to sort out the conflicts. You do this the same way you solve merge conflicts, by checking all of the files git says have been changed in both histories and picking the versions you want. Be aware that these changes will show up in your pull request, so try and incorporate upstream changes as much as possible.

You pick a file by git adding it - you do not make commits during a rebase.

Once you are done fixing conflicts for a specific commit, run:

git rebase --continue

This will continue the rebasing process. Once you are done fixing all conflicts you should run the existing tests to make sure you didn’t break anything, then run your new tests (there are new tests, right?) and make sure they work also.

If rebasing broke anything, fix it, then repeat the above process until you get here again and nothing is broken and all the tests pass.

Make a pull request

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!

Guidelines

  1. Uphold the current code standard:
    • Keep your code [DRY][].
    • Apply the [boy scout rule][].
    • Follow STYLE-GUIDE.md
  2. Run the [tests][] before submitting a pull request.
  3. Tests are very, very important. Submit tests if your pull request contains new, testable behavior.

Checklist:

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 rebase the upstream master branch after I finished all my work?
  • 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.