SemanticConflict
Posted Sun, 14/08/2011 - 00:08 by lior.kanfi
"Those who hear my colleagues and I talk about FeatureBranch know that we're not big fans of that pattern. An important part of our objection is the observation that branching is easy, but merging is hard. One argument we hear from time to time is that modern VersionControlTools make merging sufficiently easy that feature branching is worthwhile."
Full story:
Comments
This approach is true and valid as long as the planning of the code is correct and braked down into logical components.
Many users need the integration branches as their code is not componentized correctly (if at all) which in turn leading to conflicts between features which are developed in parallel and their integration on the Trunk causing major functionality issues.
In other words, we, as professionals, need to urge users to define and think about their code structure before defining the branching strategies, as the branching strategy is born out of the development structure and needs.