News for hackers. Stuff that matters.
Re:Git is Not a New Subversion by sergiotapia on Thursday October 17, 2013 @10:40AM (#6565639)
It's useful to follow a proper branching model.

Where I work we use master as the release-production-ready code. We branch of version branches from there. So a 2.5 release will be based off of master.

We work off of develop, and branch out topical branches from there, once complete merge to develop, test, once approved merge develop towards master.

And so on and so forth. It's very clean and makes it easy to test out other developer's feature as everything is encapsulated in a branch.

Re:Git is Not a New Subversion by tobidobi on Thursday October 17, 2013 @10:43AM (#6565663)
Same approach here in our team! Basically a very similar model to what "git-flow" propagates. And actually one that is very easy to understand.
Re:Git is Not a New Subversion by rallison on Thursday October 17, 2013 @12:42PM (#6566493)
And same here. The general git-flow workflow has worked extremely well for us and has cut down on almost all version control issues we previously had.