search

AfricaHackTrip / simple-speed

Fast and simple Internet bandwidth speed testing
https://simplespeed.5apps.com
16 stars 7 forks source link

New style #16

Closed lukehefson closed 10 years ago

lukehefson commented 10 years ago

This should be good to go. There's still a few things I'd like to tweak but I'll add those as separate issues.

raucao commented 10 years ago

@owgee Can you please stop merging pull requests without others having reviewed and commented on them? I'll reset yet again.

See https://github.com/AfricaHackTrip/simple-speed/pull/13#issuecomment-26885364

Before merging PRs, please make sure there's at least one other person who comments that the changes are reviewed and working.

owgee commented 10 years ago

Oh okay,sorry.Need to familiarise well with these things.

raucao commented 10 years ago

No worries. Maybe this is useful to you: http://scottchacon.com/2011/08/31/github-flow.html

TL;DR:

  • Anything in the master branch is deployable
  • To work on something new, create a descriptively named branch off of master (ie: new-oauth2-scopes)
  • Commit to that branch locally and regularly push your work to the same named branch on the server
  • When you need feedback or help, or you think the branch is ready for merging, open a pull request
  • After someone else has reviewed and signed off on the feature, you can merge it into master
  • Once it is merged and pushed to ‘master’, you can and should deploy immediately