search

twilio / twilio-chat-js-cordova-example

Cordova app example for Twilio Programmable Chat with working iOS and Android push messages
https://www.twilio.com/chat
8 stars 9 forks source link

fixed some typos #5

Closed SinithH closed 5 years ago

SinithH commented 5 years ago

fixed some typos

berkus commented 5 years ago

Hi, thanks for this fix, but can you please check why it contains two commits with the same change?

SinithH commented 5 years ago

because I have merged it into my forked repo first

berkus commented 5 years ago

Ok, we generally use rebase instead of self-merges, could you please rebase your PR to the latest master?

SinithH commented 5 years ago

How can I do that?

berkus commented 5 years ago

If you use gitup from gitup.co you just press opt+r on the branch your want to rebase and then force push it.

You could also

  1. make a new local branch with the same name but starting from current master;
  2. cherry pick commit [919bf84] into it, and
  3. force push it over your old branch (something like git push --fore origin SinithH-patch-1). This will update the PR automatically.
SinithH commented 5 years ago

I have no idea how to do that I am new to these

berkus commented 5 years ago

Hacktoberfest is a good time to learn :)

https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase

berkus commented 5 years ago

It would make sense to just start over from the current master (it has been updated just a few mins ago).

SinithH commented 5 years ago

I can't understand