News for hackers. Stuff that matters.

ChrisMeek

Re:BT fault hits broadband users and banks on Wednesday July 20, 2016 @11:29AM (#12129770)
I've been with BT for a very long time (5+ years) and other than during unseasonably violent storms this is the first time that I've suffered any kind of outage at all. Not only that but I'm in the middle of nowhere and still get fibre (to cab at least)
Re:GitFlow considered harmful on Friday June 19, 2015 @11:30AM (#9745434)
I'm starting to think that part of the problem we are facing at the moment is that feature branching itself can be exceptionally harmful.

I see statements like "The power of git is the ability to work in parallel without getting in each-others way" and get really worried about what people are trying to achieve. I want my team's code to be continuously integrated so that problems are identified early, not at some arbitrary point down the line when two features are finished but conflict with each other when both are merged. We seem to be reversing all the good work the continuous integration movement gave us; constant integration makes integration issues smaller and easier to fix.

I personally prefer to use toggling and techniques like branch by abstraction to enable a single mainline approach. Martin Fowler has a very good article on it here http://martinfowler.com/bliki/FeatureBranch.html