PokemonShowdownAndroidClient icon indicating copy to clipboard operation
PokemonShowdownAndroidClient copied to clipboard

Published 20 hours ago • verified publisher icon NamTThai

Basic Replay Support

Open Mimerme opened this issue 10 years ago • 6 comments

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!

Mimerme avatar Jan 25 '15 00:01 Mimerme

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

NamTThai avatar Jan 25 '15 16:01 NamTThai

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

CLEMENTINATOR avatar Jan 25 '15 16:01 CLEMENTINATOR

@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?

Mimerme avatar Jan 26 '15 01:01 Mimerme

Like usually you want to:

  • fetch upstream/master
  • merge it with your master branch
  • do your work in master (not recommended) or in a new branch (recommanded)
  • commit your stuff
  • fetch upstream and merge again and commit

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

CLEMENTINATOR avatar Jan 26 '15 08:01 CLEMENTINATOR

Yeah that sounds good

NamTThai avatar Jan 26 '15 14:01 NamTThai

Ah ok, thank you for the help TeToNN

Mimerme avatar Jan 27 '15 00:01 Mimerme