NamTThai / PokemonShowdownAndroidClient

Other
44 stars 14 forks source link

Basic Replay Support #76

Open Mimerme opened 9 years ago

Mimerme commented 9 years ago

TODO : Allow user to view their own replays Create a better front end Download and watch local replays Make code prettier?

Any criticism would be greatly appreciated, thanks!

NamTThai commented 9 years ago

@Mimerme hey tks for the PR. Im in the middle of something; I'll take a look as soon as I can

CLEMENTINATOR commented 9 years ago

it's really hard reviewing this since it seems like you didnt merge upstream/master correctly.

I can see commis made by me while it shouldnt happen

Mimerme commented 9 years ago

@TeToNN New to contributing code with git, so what does it exactly mean that I didn't merge the branches correctly? What should it be instead?

CLEMENTINATOR commented 9 years ago

Like usually you want to:

So on a pull request it shows your commits only and something like Merge remote-tracking branch 'upstream/master' into xxx.

Not sure what Nam thinks about it though

NamTThai commented 9 years ago

Yeah that sounds good

Mimerme commented 9 years ago

Ah ok, thank you for the help TeToNN