Skip to content

Conversation

@Mimerme
Copy link

@Mimerme Mimerme commented Jan 25, 2015

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!

Notes
- Only singles supported
- Unstable for other replays
- user cannot choose their own replay to watch
@NamTThai
Copy link
Owner

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

@CLEMENTINATOR
Copy link

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

- changed some variable names
@Mimerme
Copy link
Author

Mimerme commented Jan 26, 2015

@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
Copy link

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

@NamTThai
Copy link
Owner

Yeah that sounds good

@Mimerme
Copy link
Author

Mimerme commented Jan 27, 2015

Ah ok, thank you for the help TeToNN

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.

4 participants