Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/drop it wording change #15234

Merged
merged 1 commit into from
Jun 7, 2017
Merged

Fix/drop it wording change #15234

merged 1 commit into from
Jun 7, 2017

Conversation

jonathanihm
Copy link
Contributor

@jonathanihm jonathanihm commented Jun 6, 2017

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:

Description

Wording change for Drop It challenge

@camperbot
Copy link
Contributor

@jonathanihm thanks for the PR.
You have pushed more than one commit. When you finish editing, squash your commits into one.
Please, review our Guidelines for Contributing, thank you!.

@BerkeleyTrue BerkeleyTrue added the status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. label Jun 6, 2017
@jonathanihm
Copy link
Contributor Author

It seems my fork was a little weird when I submitted this, please let me know if you want me to close this and submit a new PR

@raisedadead
Copy link
Member

raisedadead commented Jun 6, 2017

@jonathanihm

You need not close the PR. You just need a rebase (remember to do it when you work on a new fix or feature).

Here is how to do so:
https://github.com/freeCodeCamp/freeCodeCamp/blob/staging/CONTRIBUTING.md#maintaining-your-fork

You should follow the same steps for this PR i.e fix/drop-it-wording-change branch

Hit us up in the Contributors Chat room, in case you need any assistance.

@raisedadead raisedadead added status: blocked Is waiting on followup from either the Opening Poster of the issue or PR, or a maintainer. and removed status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. labels Jun 6, 2017
@camperbot
Copy link
Contributor

@jonathanihm updated the pull request.

@jonathanihm
Copy link
Contributor Author

Sorry, I thought I had done this all but apparently I just suck at Git. Thanks!

@raisedadead raisedadead added status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. and removed status: blocked Is waiting on followup from either the Opening Poster of the issue or PR, or a maintainer. labels Jun 7, 2017
@raisedadead
Copy link
Member

@jonathanihm thanks for the pull request and making the changes, and do not worry we have all been there, it's only a matter of time and practice and you will be an expert at git too.

@raisedadead raisedadead merged commit a8d701e into freeCodeCamp:staging Jun 7, 2017
@raisedadead raisedadead removed the status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. label Jun 7, 2017
mhatout pushed a commit to mhatout/freeCodeCamp that referenced this pull request Feb 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants