Update: Ember cookbook to cli

[nicolechung]

Cookbooks to ember-cli.

JSbins: I was using the free (non-account) version to create the bins...is this going to be a problem? Do the previews expire?

[nicolechung]

@trek updated to reflect #30 but can't check my work visually until #35 is merged.

[rwjblue]

#35 is merged now

[trek]

I think, yes, the previews expire now :(

[nicolechung]

Ok, will redo.

[trek]

There is larger issues that if jsbins need updates, we need to use a shared account. In the core team meeting just now we decided moving examples to cli style is more important than live code samples. We're going to just remove jsbins until we figure out how to better have live samples.

[nicolechung]

So....remove the JSbins for now?

[trek]

Yeah, we're just going to nuke them. Possibly comment them out so we know where to put them back in later?

[nicolechung]

Ok sounds good to me!

[nicolechung]

Commented out JSbins

[rwjblue]

This is not needed.

[locks]

What's needed for merging?

[trek]

Can you squash this into a single commit?

[nicolechung]

@trek the person who is accepting the pull request you mean?

[joostdevries]

@nicolechung I think he meant you. I also usually squash my own PR's before they get merged.

[nicolechung]

@joostdevries how do you do this? (forgive me if this is a stupid question). I only know how to squash when merging.

I've merged the master a few times into this feature (to keep up). If I do a git rebase -i master is that totally going to rewrite history for other people?

[locks]

@nicolechung I hope these are helpful:

• http://makandracards.com/makandra/527-squash-several-git-commits-into-a-single-commit
• http://davidwalsh.name/squash-commits-git
• http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

If you're unsure I can help you directly later today.

[joostdevries]

When I've already merged master into my dev branch, I usually do a merge-squash:

git checkout cookbooks-to-cli
git branch -m cookbooks-to-cli-old
git checkout master
git checkout -b cookbooks-to-cli
git merge --squash cookbooks-to-cli-old
git commit

[nicolechung]

Thanks @locks and @joostdevries I'll get on this in the afternoon...

[locks]

@trek seems ready