We have a web app that we update and release almost daily. We use git as our VCS, and our current branching strategy is very simple and broken: we have a master branch and we check changes that we ‘feel good about’ into it. This works, but only until we check in a breaking change.
Does anyone have a favorite git branch strategy for small teams which meets the following requirements:
- Works well for teams of 2 to 3 developers
- Lightweight, and not too much process
- Allows devs to isolate work on bug fixes and larger features with ease
- Allows us to keep a stable branch (for those ‘oh crap’ moments when we have to get our production servers working)
Ideally, I’d love to see your step-by-step process for a dev working on a new bug
