search

AdrianMachado / KaiUI

React component library for KaiOS apps
MIT License
187 stars 39 forks source link

Typescript Conversion #34

Closed patburke234 closed 4 years ago

patburke234 commented 4 years ago

Convert to Typescript Add new UI controls

AdrianMachado commented 4 years ago

Will review this weekend.

AdrianMachado commented 4 years ago

Is it possible to split this out into multiple Pull requests to make this easier to review? At least splitting out the new features from converting existing features would be helpful

AdrianMachado commented 4 years ago

Pls fix the merge conflicts and add new lines at the end of all files

patburke234 commented 4 years ago

Pls fix the merge conflicts and add new lines at the end of all files

Why newlines at the end of all files?

patburke234 commented 4 years ago

Doesn't let me merge above since I don't have write access. Can you grant that to me? You can remove it after if you wish.

AdrianMachado commented 4 years ago

Pls fix the merge conflicts and add new lines at the end of all files

Why newlines at the end of all files?

I think all text files have newlines by default. Here's an explanation: https://unix.stackexchange.com/questions/18743/whats-the-point-in-adding-a-new-line-to-the-end-of-a-file

AdrianMachado commented 4 years ago

@patburke234 I just sent you a collaborator invite. Once you accept, you should be able to merge after fixing merge conflicts

patburke234 commented 4 years ago

Honestly been trying to figure out how to merge for a couple hours now... the command line instructions above keep saying, "Already up to date". Apologies, but I have no idea how to do this.

AdrianMachado commented 4 years ago

Did you try to fetch from remote before pulling? Lemme know what commands you are running.

On Wed, Jun 10, 2020 at 12:02 PM Patrick Burke notifications@github.com wrote:

Honestly been trying to figure out how to merge for a couple hours now... the command line instructions above keep saying, "Already up to date". Apologies, but I have no idea how to do this.

— You are receiving this because your review was requested. Reply to this email directly, view it on GitHub https://github.com/AdrianMachado/KaiUI/pull/34#issuecomment-642198262, or unsubscribe https://github.com/notifications/unsubscribe-auth/ACVPA567QSAHQPERVXSN7LDRV7KCRANCNFSM4NC5UKFQ .

patburke234 commented 4 years ago

git checkout -b patburke234-master master git pull https://github.com/patburke234/KaiUI-Typescript.git master git checkout master git merge --no-ff patburke234-master git push origin master

AdrianMachado commented 4 years ago

See https://stackoverflow.com/questions/15376241/why-does-git-say-my-master-branch-is-already-up-to-date-even-though-it-is-not/15381342 I think you need to fetch from the master branch on this repo, not your own, then merge.

patburke234 commented 4 years ago

Created a new one