-
Notifications
You must be signed in to change notification settings - Fork 234
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
introduce Typeform OAuth provider #226
Conversation
…n in addition to global setting
…alesforce provider
Only the last three commits are relevant (775f6ee, 116ba17, fd4cc81). The first four commits have already been merged into upstream repo with a previous pull request and were auto-included by the Pull Request process probably due to past history. I should probably rebase and merge my repo with upstream. |
Thanks for your PR |
Great! Do you know how am I supposed to pull/merge with your upstream repo from my form in order for future PRs not to include my entire contribution history? There seem to be multiple methods discussed at https://stackoverflow.com/questions/3903817/pull-new-updates-from-original-github-repository-into-forked-github-repository |
git remote add upstream https://github.com/TerribleDev/OwinOAuthProviders.git
git fetch --all
git checkout master
git reset --hard upstream/master
git push origin master --force |
usually in my forks I will do the work for a PR in a separate branch in my fork so my master can be updated with just a:
|
Thanks, makes sense. I'll start doing that from now on. |
Np, git is the result of super smart engineers making a tool....the user experience is less than ideal, and you can easily shoot yourself in the foot. |
per docs at https://developer.typeform.com/get-started/applications/