First open source pull request!

[bcarson]

I think I've got it this time, please let me know if I need to correct anything.
Thanks again for your help Kent!

[kentcdodds]

Fantastic! Thanks for the pull request! Let me add a few inline comments for you. I have some feedback :-)

[kentcdodds]

Could you link this to the specific answer that this is using? There's a share link below the answer.

[kentcdodds]

Looking pretty good. When you've completed what I've noted, could you follow the instructions on how to squash your commits? When you do, you'll get a chance to update your commit message which must follow our conventions

Let me know if you have any trouble! Enjoy learning :D Thanks!

[bcarson]

Aye aye captain :) I have to work today, but I’ll incorporate your comments and resubmit soon.

From: "Kent C. Dodds" notifications@github.com
Reply-To: eggheadio-github/stack-overflow-copy-paste reply@reply.github.com
Date: Monday, May 9, 2016 at 10:24 AM
To: eggheadio-github/stack-overflow-copy-paste stack-overflow-copy-paste@noreply.github.com
Cc: Bonnie Brennan bjcarson75@yahoo.com, Author author@noreply.github.com
Subject: Re: [eggheadio-github/stack-overflow-copy-paste] First open source pull request! (#26)

Looking pretty good. When you've completed what I've noted, could you follow the instructions on how to squash your commits? When you do, you'll get a chance to update your commit message which must follow our conventions

Let me know if you have any trouble! Enjoy learning :D Thanks!

—
You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub

[kentcdodds]

ping :)

[bcarson]

I squashed my commits but I have merge conflicts, not sure what I did wrong there.

[kentcdodds]

It's quite possible that your local master branch is behind this project's master. You'll want to set this repo as an upstream and have your local master track upstream/master as demonstrated in this video.