Skip to content
This repository has been archived by the owner on Jan 16, 2021. It is now read-only.

Spelling #183

Merged
merged 1 commit into from
Oct 23, 2015
Merged

Spelling #183

merged 1 commit into from
Oct 23, 2015

Conversation

hhanesand
Copy link
Contributor

Defualt -> Default

@nlutsenko
Copy link
Contributor

Nice. Thanks for catching this!
Will merge in after Travis passes, since it's a required check.

@hhanesand
Copy link
Contributor Author

It's also in the PFQueryCollectionViewController, one sec

@nlutsenko
Copy link
Contributor

Great! Can you squash 2 commits together?

@hhanesand
Copy link
Contributor Author

How would I best achieve that? (rebase?) Not too familiar with git. I guess I could submit a new pr

@facebook-github-bot
Copy link

Thank you for your pull request and welcome to our community. We require contributors to sign our Contributor License Agreement, and we don't seem to have you on file. In order for us to review and merge your code, please sign up at https://code.facebook.com/cla - and if you have received this in error or have any questions, please drop us a line at [email protected]. Thanks!

@nlutsenko
Copy link
Contributor

  • git rebase -i origin/master
  • In text editor that opened - you should see 2 lines starting with pick and followed by commit hash + message.
  • Simply change second line to start from f or fixup
  • Close the text editor saving the changes
  • git push -f
  • ???
  • Profit

Defualt -> Default
@hhanesand
Copy link
Contributor Author

Ok, got it, I had to configure sublime as the default git editor. Thanks for the help 👍

About the CLA, I've already submitted one, but I've changed my github username lately, so I'm waiting for them to update it.

@nlutsenko
Copy link
Contributor

Sure, once the bot confirms the CLA signed - will merge in.

@nlutsenko
Copy link
Contributor

@hhanesand I suggest you try re-accepting the CLA, or I won't be able to merge it in...

@nlutsenko nlutsenko added this to the 1.1.7 milestone Oct 23, 2015
@hhanesand
Copy link
Contributor Author

@nlutsenko Accepted again with a different email

@facebook-github-bot
Copy link

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Facebook open source project. Thanks!

@nlutsenko
Copy link
Contributor

Great. Merging in now.

nlutsenko added a commit that referenced this pull request Oct 23, 2015
@nlutsenko nlutsenko merged commit c582b64 into parse-community:master Oct 23, 2015
@nlutsenko nlutsenko mentioned this pull request Nov 18, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants