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.

Sign up for GitHub

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

Jump to bottom

Update documentation with new Git workflow #803

Merged
merged 3 commits into from
Jan 3, 2019
Merged

Update documentation with new Git workflow #803

merged 3 commits into from
Jan 3, 2019

Conversation

tony-ho
Copy link
Contributor

@tony-ho tony-ho commented Oct 13, 2018

Fixes

Fixes #799

Checklist

  • I have made a material change to the repo (functionality, testing, spelling, grammar)
  • I have read the [Contribution Guide] and my PR follows them.
  • I updated my branch with the master branch.
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation about the functionality in the appropriate .md file
  • I have added in line documentation to the code I modified

Short description of what this PR does:

  • Update CONTRIBUTING.md documentation, explaining the process of forking and branching off the development branch and submitting PRs against the development branch.
  • Update PULL_REQUEST_TEMPLATE with the same addition to the CONTRIBUTING.md documentation.
  • Remove duplicate content PULL_REQUEST_TEMPLATE.md

@thinkingserious thinkingserious added the status: code review request requesting a community code review or review from Twilio label Oct 13, 2018
reedsa
reedsa approved these changes Oct 15, 2018
View reviewed changes
Copy link
Contributor

@reedsa reedsa left a comment

Choose a reason for hiding this comment

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

Excellent update, thanks for your contribution!

@reedsa reedsa added status: ready for deploy code ready to be released in next deploy and removed status: code review request requesting a community code review or review from Twilio labels Oct 15, 2018
@devchas devchas added difficulty: easy fix is easy in difficulty good first issue type: docs update documentation change not affecting the code status: work in progress Twilio or the community is in the process of implementing labels Oct 17, 2018
@thinkingserious thinkingserious added status: hacktoberfest approved and removed status: work in progress Twilio or the community is in the process of implementing labels Oct 22, 2018
@thinkingserious
Copy link
Contributor

Hello @tony-ho,

Thanks again for the PR!

It's HACKTOBERFEST! We want to show our appreciation by sending you some special Hacktoberfest swag. If you have not already, could you please fill out this form so we can send it to you? Thanks!

Team SendGrid DX

@thinkingserious
Copy link
Contributor

Hello @tony-ho,

Thanks again for the PR!

We noticed that you have earned 2 out of the 5 points needed to receive glorious SendGrid Hacktoberfest swag.

Please take a moment to checkout this link to find more issues to get you past the required threshold.

Also, please be sure that you have officially registered here.

Thank you and Happy Hacktobering!

Team SendGrid DX

@tony-ho tony-ho mentioned this pull request Oct 27, 2018
Closed
6 tasks
@thinkingserious
Copy link
Contributor

Hi @tony-ho,

Please resolve the merge conflict and I'll get this one merged. Thank you!

With Best Regards,

Elmer

@thinkingserious thinkingserious added status: waiting for feedback waiting for feedback from the submitter and removed status: ready for deploy code ready to be released in next deploy good first issue labels Oct 29, 2018
@tony-ho
Copy link
Contributor Author

tony-ho commented Oct 30, 2018

@thinkingserious Merge conflicts have been resolved.

Note the PR build fails due to the build failures on master. I've resolved these in #824.

@thinkingserious thinkingserious merged commit 9ddd8ae into sendgrid:master Jan 3, 2019
@thinkingserious
Copy link
Contributor

Hello @tony-ho,

Thanks again for the PR!

We appreciate your contribution and look forward to continued collaboration. Thanks!

Team SendGrid DX

@tony-ho tony-ho deleted the gitflow branch January 3, 2019 22:49
@snyk-bot snyk-bot mentioned this pull request Dec 5, 2019
Open
@snyk-bot snyk-bot mentioned this pull request Feb 7, 2020
Open
@snyk-bot snyk-bot mentioned this pull request Mar 19, 2020
Merged
@snyk-bot snyk-bot mentioned this pull request Apr 17, 2020
Closed
@snyk-bot snyk-bot mentioned this pull request Apr 22, 2020
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@reedsa reedsa reedsa approved these changes

@ashishpatelcs ashishpatelcs ashishpatelcs approved these changes

Assignees
No one assigned
Labels
difficulty: easy fix is easy in difficulty status: waiting for feedback waiting for feedback from the submitter type: docs update documentation change not affecting the code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Document new Git workflow in CHANGELOG.md
5 participants
@tony-ho @thinkingserious @reedsa @ashishpatelcs @devchas