convore.json/groups/git/large-team-and-feature-branches-vs-commit-to-master/messages.json

[{"user_id": 10831, "stars": [], "topic_id": 38474, "date_created": 1307455303.7338679, "message": "that's how we do it at github, cmheisel", "group_id": 106, "id": 1321688}, {"user_id": 3965, "stars": [], "topic_id": 38474, "date_created": 1307454533.575228, "message": "I work on a large team (~30 devs). We're currently using a git workflow where we have a feature branch, we build that feature to a feature environment (assuming all tests pass). We do a bit of manual testing and then fix any bugs and merge the feature branch into master (and do a prod release from there).", "group_id": 106, "id": 1321473}, {"user_id": 3965, "stars": [], "topic_id": 38474, "date_created": 1307454582.2095339, "message": "But then I saw this about Prezi's workflow: http://reinout.vanrees.org/weblog/2011/06/07/continuous-integration.html and I'm wondering if switching to master + feature flag workflow would help us out, esp. with rebase/merge hell?", "group_id": 106, "id": 1321490}, {"user_id": 9063, "stars": [], "topic_id": 38474, "date_created": 1307454915.5088589, "message": "@peritus The book (http://continuousdelivery.com/) is also highly recommended!", "group_id": 106, "id": 1321596}, {"user_id": 9063, "stars": [], "topic_id": 38474, "date_created": 1307454886.2532971, "message": "Here's an interview with Martin Fowler and Jez Humble (author of \"Continous Delivery\") explaining feature branch hell and what to do: http://www.infoq.com/interviews/jez-humble-martin-fowler-cd", "group_id": 106, "id": 1321586}, {"user_id": 3965, "stars": [], "topic_id": 38474, "date_created": 1307463241.8897829, "message": "@chacon -- One large team all editing on master I take it and not the way we're currently working?", "group_id": 106, "id": 1323065}, {"user_id": 8327, "stars": [], "topic_id": 38474, "date_created": 1307479103.7669749, "message": "We had this discussion in my office recently, while everyone liked the idea, it really seemed to fall down at the DB level. Perhaps we were a little unimaginative, but feature flagging DB schema changes, something we seem to end up doing a lot (it's an inherited, never going to be refactored mess of a thing), didn't really seem practical.", "group_id": 106, "id": 1327608}, {"user_id": 28370, "stars": [], "topic_id": 38474, "date_created": 1307484403.209234, "message": "@cmheisel no, feature branches and pull requests.  We only touch master to bring in things that are safe to be deployed... and almost always deploy them immediately.", "group_id": 106, "id": 1328820}, {"user_id": 8391, "stars": [{"date_created": 1307725772.687592, "user_id": 2588}], "topic_id": 38474, "date_created": 1307510497.5810161, "message": "http://nvie.com/posts/a-successful-git-branching-model/", "group_id": 106, "id": 1334027}, {"user_id": 9063, "stars": [], "topic_id": 38474, "date_created": 1307512146.3584099, "message": "@kennethreitz Looks like merge hell to me.", "group_id": 106, "id": 1334184}, {"user_id": 8391, "stars": [{"date_created": 1307546279.3606081, "user_id": 2320}, {"date_created": 1307639840.583735, "user_id": 20967}, {"date_created": 1307683569.5355251, "user_id": 4156}, {"date_created": 1307936959.354718, "user_id": 5778}, {"date_created": 1308035798.1890759, "user_id": 19897}, {"date_created": 1308608149.7728789, "user_id": 8327}], "topic_id": 38474, "date_created": 1307544558.0465021, "message": "@peritus it's git, there is no merge hell.", "group_id": 106, "id": 1337798}, {"user_id": 2320, "stars": [], "topic_id": 38474, "date_created": 1307546305.996197, "message": "@peritus works wonderfully", "group_id": 106, "id": 1338160}, {"user_id": 19952, "stars": [], "topic_id": 38474, "date_created": 1308339239.8201289, "message": "git-flow ftw.", "group_id": 106, "id": 1421961}]