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

add AWS app tutorial to USE_CASES.md #366

Merged
merged 6 commits into from
Dec 1, 2017

Conversation

codevbus
Copy link
Contributor

@codevbus codevbus commented Oct 8, 2017

Added tutorial to USE_CASES.md for AWS, utilizing the AWS CodeStar service.

@thinkingserious thinkingserious added the status: code review request requesting a community code review or review from Twilio label Oct 8, 2017
@SendGridDX
Copy link

SendGridDX commented Oct 8, 2017

CLA assistant check
All committers have signed the CLA.

@thinkingserious
Copy link
Contributor

Hi @codevbus,

Could you please resolve the conflict? Thanks!

1 similar comment
@thinkingserious
Copy link
Contributor

Hi @codevbus,

Could you please resolve the conflict? Thanks!

@codecov-io
Copy link

codecov-io commented Oct 22, 2017

Codecov Report

❗ No coverage uploaded for pull request base (master@4ae3c96). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master     #366   +/-   ##
=========================================
  Coverage          ?   81.98%           
=========================================
  Files             ?        9           
  Lines             ?      999           
  Branches          ?      160           
=========================================
  Hits              ?      819           
  Misses            ?       90           
  Partials          ?       90

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4ae3c96...36e68ba. Read the comment docs.

gabrielkrell pushed a commit to gabrielkrell/sendgrid-python that referenced this pull request Oct 22, 2017
@codevbus
Copy link
Contributor Author

codevbus commented Oct 24, 2017

@thinkingserious The conflict was corrected in 87e84b7, however it now looks like it's in conflict again?

Looks like 6114af5 pulled in another PR ahead of mine and sent me in to conflict again.

@thinkingserious
Copy link
Contributor

@codevbus

We have not been able to merge your Pull Request, but because you are awesome - we wanted to make sure you could still get a SendGrid Hacktoberfest shirt.

Please go fill out our swag form before Nov 5th and we will send the shirt! (We know that you might have tried this before and it didn’t work, sorry about that!)

You have till Nov 5th to fill out this form in order to get the Hacktoberfest shirt!

Thank you for contributing during Hacktoberfest! We hope to see you in the repos soon! Just so you know, we always give away a SendGrid shirt for your first ever non-Hacktoberfest PR that gets merged.

@codevbus
Copy link
Contributor Author

codevbus commented Nov 2, 2017

@thinkingserious - Thanks for the offer! Luckily, I was already sent my shirt/swag.

Several times now I've been asked to correct merge conflicts so that my PR can be merged in, then nothing happens and another PR is merged ahead of mine, creating a new conflict.

What is the path forward at this point?

@thinkingserious
Copy link
Contributor

Hi @codevbus,

I apologize for the conflict mess :(

In my rush to merge small items as they came in, I failed to realize the impact on previous open PRs. So now, we are processing all the PRs in order from oldest to newest. Since we received over 1,000 PRs last month, this is taking longer than normal.

It should be safe for you to go ahead fix the current conflicts.

We appreciate your patience and support!

With Best Regards,

Elmer

@codevbus
Copy link
Contributor Author

codevbus commented Nov 4, 2017

@thinkingserious - Corrected the conflicts in 36e68ba.

No worries, and thanks for your help/responses!

Also, FWIW, the link you sent for the shirt did not work. I attempted it after realizing you were referring to a SendGrid shirt specifically, not the general Hacktoberfest one.

Thanks again, enjoy your weekend!

@thinkingserious
Copy link
Contributor

@codevbus,

Sorry about that! The link should now work :)

@thinkingserious thinkingserious merged commit abc9478 into sendgrid:master Dec 1, 2017
@thinkingserious
Copy link
Contributor

Hello @codevbus,

Thanks again for the PR!

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

Team SendGrid DX

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
difficulty: medium fix is medium in difficulty status: code review request requesting a community code review or review from Twilio
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants