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

Tiny text improvements #235

Merged
merged 3 commits into from
Jan 20, 2016
Merged

Tiny text improvements #235

merged 3 commits into from
Jan 20, 2016

Conversation

demidovakatya
Copy link
Contributor

No description provided.

@oranja
Copy link
Contributor

oranja commented Jan 14, 2016

Nice. Proper English always helps me feel more comfortable with a project.

@derekstavis
Copy link
Member

Thanks for the improvements, they are very welcome! The only detail is that you need to rebase the commits on current master, as we already removed upgrade instructions from README. I can merge as soon as you resolve this conflict. Thanks again 😄

@demidovakatya
Copy link
Contributor Author

@derekstavis being honest, I have some troubles with rebasing. Could you tell me how to rebase correctly? 🍒

@derekstavis
Copy link
Member

Yes @demidovakatya. The steps I usually do is:

  1. git checkout master
  2. git pull upstream master
  3. git rebase master <your branch>
  4. Solve possible conflicts in files
  5. git add .
  6. git rebase --continue
  7. Conflicts? Go back to 4, else you are done
  8. git push <your remote> <your branch>

This should be sufficient. Feel free to join us on Slack if you continue finding problems 👍

@derekstavis derekstavis reopened this Jan 14, 2016
@derekstavis
Copy link
Member

(Sorry, mistakenly closed)

@demidovakatya
Copy link
Contributor Author

I still have problems with rebase, but no more conflicts, right?

Thanks for your help, guys! ☀️

@derekstavis
Copy link
Member

I will rebase them for you. Thanks for your efforts!

@VEINHORN VEINHORN mentioned this pull request Jan 19, 2016
@derekstavis
Copy link
Member

You got it @demidovakatya 👏👏👏👏

@demidovakatya
Copy link
Contributor Author

🎈 🎈

derekstavis added a commit that referenced this pull request Jan 20, 2016
@derekstavis derekstavis merged commit 46558a3 into oh-my-fish:master Jan 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants