josuebrunel / yahoo-fantasy-sport

Python Yahoo! Fantasy Sports
MIT License
28 stars 9 forks source link

Specify a Week and Players sub-resource for get_teams_roster #24

Closed peacing closed 9 years ago

peacing commented 9 years ago

So I created this issue, then changed to code to fix it and wanted to commit the changes by doing the following:

screen shot 2015-07-02 at 8 14 55 pm

Was this correct? Should I now close this issue?

josuebrunel commented 9 years ago

Hello Paul.

Was this correct? Should I now close this issue?

Yes it was.

But since i merged your pull request and i might have changed some code (sometimes no need to), the first thing to do, is to update your forked repository. To do so , follow the steps below :

Main page of the forked repository paul-forked-repo-1

Switch bases paul-forked-repo-2

Create a pull request on your forked repository then merge it paul-forked-repo-3

Finally

$ git pull origin master

Note :

Since your already have committed beforing pulling, you might have some merge conflict when doing the pull.

If you have trouble with some merge conflict, let me know.

Have a good day

peacing commented 9 years ago

I'm happy to report the merge went relatively smoothly without and conflicts ;)

josuebrunel commented 9 years ago

Oh great, happy to hear that