On: Why aren't you using git-flow?

[klochner]

I develop in master sometimes, but only check in small edits that are pushed immediately.

If my edits grow to the point that I need to write tests or push to staging, I just checkout a feature branch before committing.

[bobbywilson0 → klochner]

If you are using git-flow, this should probably be done in a hotfix branch, so that when you are done, finishing your hotfix merges directly to master and develop. Without a hotfix you would have to manually merge master back into develop.

[klochner → bobbywilson0]

It sounds like git-flow removes some hassle, can anyone answer the question about adding git-flow to an existing repo?

[jkreeftmeijer → klochner]

Running `git flow init` in an existing repository will ask you which branches you want to use as master- and development branches. So, yes. :)