search

koajs / examples

Example Koa apps
4.52k stars 744 forks source link

Add README.md for the stream-* files - DO NOT USE #46

Closed richb-hanover closed 9 years ago

richb-hanover commented 9 years ago

I found it difficult to figure out how to make the examples work, so I wrote these READMEs. In addition, I fixed a few typos and Lint'ed the files so there are fewer Javascript questions.

Please review my descriptions to be sure they're accurate.

Also, feel free to aggregate these changes into a single commit. Thanks!

Rich

yoshuawuyts commented 9 years ago

cool!

hemanth commented 9 years ago

Could you please squash the commits?

richb-hanover commented 9 years ago

@hemanth Sorry - my git fu isn't strong enough. (and I see why it would have been great to do it had I known how to do it before I pushed the commits to github...) Is this something I can do now that they're on my github fork?

hemanth commented 9 years ago

Definitely, checkout squashing with rebase.

richb-hanover commented 9 years ago

Thanks for the pointer. I think I screwed things up pretty badly. I can't say for certain, but I think it's because I edited some files locally, and some from github. I'm getting this error:

richs-mbp-10715:KoaJSExamples richb$ git rebase -i HEAD-4 fatal: Needed a single revision invalid upstream HEAD-4

I plan to delete my fork on github, re-clone to my local system then apply the the changes and re-send a pull request... (there are only four folders that changed...)

Best,

Rich

On Mar 26, 2015, at 1:21 AM, hemanth.hm notifications@github.com wrote:

Definitely, checkout squashing with rebase.

— Reply to this email directly or view it on GitHub.

richb-hanover commented 9 years ago

Done. I've issued a new pull request to replace this one

hemanth commented 9 years ago

Yikes..git rebase -i HEAD~4 it's tilde not - :+1: