Skip to content
This repository was archived by the owner on Sep 25, 2019. It is now read-only.

docs(contributing): add Contributing Guide#75

Merged
raisedadead merged 3 commits intofreeCodeCamp:devfrom
scissorsneedfoodtoo:feat/add-contributing-guide
Jun 29, 2018
Merged

docs(contributing): add Contributing Guide#75
raisedadead merged 3 commits intofreeCodeCamp:devfrom
scissorsneedfoodtoo:feat/add-contributing-guide

Conversation

@scissorsneedfoodtoo
Copy link
Copy Markdown
Contributor

@scissorsneedfoodtoo scissorsneedfoodtoo commented Jun 29, 2018

Pre-Submission Checklist

  • Your pull request targets the staging branch of freeCodeCamp.
  • Branch starts with either fix/, feature/, or translate/ (e.g. fix/signin-issue)
  • You have only one commit (if not, squash them into one commit).
  • All new and existing tests pass the command npm test. Use git commit --amend to amend any fixes.

Type of Change

  • Small bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds new functionality)
  • Breaking change (fix or feature that would change existing functionality)
  • Add new translation (feature adding new translations)

Checklist:

  • Tested changes locally.
  • Addressed currently open issue (replace XXXXX with an issue no in next line)

Closes #61

Description

Took the challenge guide from the main repo and reworked it for the Curriculum repo. Moved the
CONTRIBUTING.md file to the root directory. Added an image directory and sample image to more
clearly show how to open a PR and point it to the correct branch, like in the guide in the
main repo.

Took the challenge guide from the main repo and reworked it for the Curriculum repo. Moved the
CONTRIBUTING.md file to the root directory. Added an image directory and sample image to more
clearly show how to open a PR and point it to the correct branch, like in the guide in the
main repo.

ISSUES CLOSED: freeCodeCamp#61
Copy link
Copy Markdown
Member

@raisedadead raisedadead left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets keep the guide in docs. On the main repo we can't move it around because its linked from several places. But here lets keep the documentation in docs. This repo is relatively new. And hence should be structured carefully.

Don't worry GitHub will still pick up the correct file from its referencing on issues and PRs.

Copy link
Copy Markdown
Member

@raisedadead raisedadead left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, lets just get this in and keep enhancing from there. Its better to have something in right away.

@raisedadead raisedadead merged commit db3f411 into freeCodeCamp:dev Jun 29, 2018
@scissorsneedfoodtoo
Copy link
Copy Markdown
Contributor Author

@raisedadead, sorry! I didn't see your response and went to bed. Thank you for making those changes. I'll keep that all in mind for the future.

@scissorsneedfoodtoo scissorsneedfoodtoo deleted the feat/add-contributing-guide branch June 30, 2018 01:10
@raisedadead
Copy link
Copy Markdown
Member

@scissorsneedfoodtoo oh yes no worries. I was in a rush.

I have gone ahead and fixed up a lot of the PR commit messages.

The release QA workflow is being documented. But here is the thumb rule:

  1. If a PR follows conventional commits, and has only one commit - Use rebase and merge option.
  2. If a PR has multiple commits, or does not follow conventional commits - Use Squash option

However while using 2. make sure to empty the description box and the commit message drafted should be in conventional format.

@raisedadead
Copy link
Copy Markdown
Member

Under no circumstances we should see a description that has a BREAKING CHANGE keyword which results in unwanted major bumps.

And as for the release itself it should be fast forwarded commits into master from dev and not via PR.

I am documenting this more precisely. Will update you soon.

@raisedadead
Copy link
Copy Markdown
Member

But for now, feel free to QA and merge the PRs. I should have updated all of them for you.

@scissorsneedfoodtoo
Copy link
Copy Markdown
Contributor Author

scissorsneedfoodtoo commented Jun 30, 2018

@raisedadead, sorry about all the errors before--didn't mean to create more work for you! I was surprised to see the version numbers going up so quickly on npm. Hopefully with these rules in place the bumps will be small and predictable. Will definitely be on the lookout for anything that says BREAKING CHANGE.

Just a quick question: For rule number 2 above, I would just delete everything in the description box, so all the asterisks, and just make sure the commit message is in the correct format. By correct format, is that just making sure the commit message was written using npm run commit with no errors?

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update the Contributing documentation

2 participants