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

WordPress Provider #204

Merged
merged 3 commits into from Apr 16, 2016
Merged

WordPress Provider #204

merged 3 commits into from Apr 16, 2016

Conversation

@pankajpatel
Copy link
Contributor

pankajpatel commented Apr 11, 2016

WordPress provider on oauth2

@Marsup

This comment has been minimized.

Copy link
Member

Marsup commented Apr 12, 2016

It will need to be rebased on a more recent commit.

@pankajpatel

This comment has been minimized.

Copy link
Contributor Author

pankajpatel commented Apr 13, 2016

how do I do that?

@ldesplat

This comment has been minimized.

Copy link
Contributor

ldesplat commented Apr 13, 2016

I like to do it this way:
git remote add upstream https://github.com/hapijs/bell
The follow: https://help.github.com/articles/syncing-a-fork/
Then it will tell you there are conflits, so you will need to manually resolve them. Follow these directions: https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/

If all that really confuses you, you can do it the old way. First backup your work. Then delete your github fork and recreate it again so you are at the latest. Then apply your work back on top of that and resubmit a new PR! But you should get used to the above instructions.

Good Luck!

@pankajpatel

This comment has been minimized.

Copy link
Contributor Author

pankajpatel commented Apr 14, 2016

Thanks @ldesplat !
That's a really good help. Let me try the rebase now.

@pankajpatel

This comment has been minimized.

Copy link
Contributor Author

pankajpatel commented Apr 15, 2016

I have merged the changes and has no conflict now. Does it look good?

@ldesplat ldesplat merged commit 642d4be into hapijs:master Apr 16, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@ldesplat ldesplat added this to the 7.5.0 milestone Apr 16, 2016
@ldesplat

This comment has been minimized.

Copy link
Contributor

ldesplat commented Apr 16, 2016

Thank you, will make a new release right now 7.5.0!

@ldesplat ldesplat added the feature label Apr 16, 2016
@ldesplat ldesplat mentioned this pull request Apr 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.