search

chriskdon / Spots

Summer Android Game
0 stars 0 forks source link

added .gitignore #25

Closed kubasub closed 9 years ago

kubasub commented 9 years ago

Just added a .gitignore file.

We might want to merge the develop branch into the master branch.

kubasub commented 9 years ago

I'm not quite sure what happened, but I think when I pushed changes to the develop branch which also contained this commit, GitHub was smart enough to close this PR.

That said, I'm not sure if I was supposed to push to develop, or if develop is the branch that we want to submit PRs to.

How do you feel about making master the main branch, the one we push PRs to, and then we have a production branch where we put our "production-level" code?

@ChrisKdon

chriskdon commented 9 years ago

Yeah, makes sense. Normally the way it works is master is production code, develop is everything in develop (it's what we merge into from other branches. And then every once and a while we merge into master and tag it as a release. I've never done tagging before so I'm not sure how that works.

kubasub commented 9 years ago

Okay sounds good to me. So we never push to master or develop, then.