search

gma / nesta

File Based CMS and Static Site Generator
http://nestacms.com
MIT License
902 stars 121 forks source link

Remove shotgun dependency #126

Closed datenimperator closed 11 years ago

datenimperator commented 11 years ago

Fixes gma/nesta#125

gma commented 11 years ago

Thanks. Your cache control headers commit made it into the same PR though; could you remove it from the topic branch so I can merge it? Cheers…

datenimperator commented 11 years ago

Oh man… when I created the PR that second commit did not exist. Do I need to create a branch for every pull request I want to get merged in independently? Not quite at home yet using git…

gma commented 11 years ago

Yeah, you really want to make a separate topic branch for each PR. At the top of the PR page it says you:

"want to merge 2 commits into gma:master from datenimperator:master"

You can delete the branch once it's been pulled, and it gives us the opportunity to chat about the approach (to a more complex problem, obviously) and re-do the commits until we're happy to merge them in. It's a great approach; on larger projects with a lot more contributions it helps spread the workload of keeping the commit history nice and tidy.

I can't remember if you'll need to make a new PR for your topic branch, or whether you'll be able to edit the branch that this points at. If you want to make a new branch with just that one commit in it, this should do it:

$ git checkout -b remove-shotgun bfd4ed55
datenimperator commented 11 years ago

I created a separate branch as you suggested. Please close this PR.

datenimperator commented 11 years ago

Oh, I can close it myself. Good.