4 ms·
My (8 person) team is currently developing software for a machine. It's the first version, in fact the machine hardware doesn't even exist yet. Instantly deplo
by skrebbel 15y ago
My (8 person) team is currently developing software for a machine. It's the first version, in fact the machine hardware doesn't even exist yet.
Instantly deployable code is, therefore, of no interest to us (currently). Things'll be different when we have releases out, installed in machines at customers, but for now, really, why branch? The author does not actually give any other argument for branching, except for "master should be instantly deployable". And even that problem could be solved in other ways than e.g. feature branches.
In fact, we want to take continuous integration to extremes. This means that if I work on X and George over there works on Y, and we end up breaking each other's code, I want to find out as fast as possible. Not when my feature is done. Today.
Less branching directly implies earlier feedback. We've yet got to hit the problem that people are really messing in the same code, big time, at the same time - after all, that's what the daily standup is for, right?
Really, how would branches help us in any way?
- dwc 15y agoBranches are a method for organization. I organize papers by putting them in a stack on my desk. If the stack gets too big I throw them in a box, intending to go through them later. But of course I never do. This is obviously a horrible scheme, but I get by just fine because the volume of truly important papers I deal with is small. It surely wouldn't scale. Even so, more orderly people are probably cringing as they read the above, and to some degree they're right. But I write code for a living, and I spend more time cleaning up my file system, organizing source code, et al. I do this because I know that not doing this ends up as more work than doing it. I use branches so that when I'm in the middle of implementing a feature and a user comes to me with a bug report I do not have to sweat having half refactored, half implemented, uncompilable stuff. I can switch branches and work on the bug. Ditto for interfacing with other devs working in other parts of the code. Finally, I have to wonder if you've used branches enough to get a feel for what they can do for you. I know that using CVS and Subversion I avoided branching as a scary and tricky thing. Having them work so easily in Git I began branching and found that it changed my workflow for the better in a fairly painless way.