On Wed, Dec 5, 2012 at 5:46 AM, Martin Owens <doctormo@...400...> wrote:
The down side to feature branch delay merge delay is that conflicts between features or fixes aren't dealt with centrally and instead rot away at the feature branches making them harder to merge over time.
I guess the Q, whether in a feature branch or in a central staging branch is, can't some of this be handled by some scripting? Effectively, it seems like it is fairly rare for conflicts to occur on regularly updated branches (thankfully in our project people tend to communicate that they're working on things so we don't step on each others toes). If it were scripted to pull trunk once a day, and then have the feature or staging branch pull right after that, it minimizes divergence... hopefully avoiding conflicts. If it hits a conflict, notify the human(s) about it to resolve the problem.
In general, I almost never see conflicts (except the .pot file) or if I have a patch applied locally and the feature gets committed to trunk w/o me seeing it first. Then again, I don't do heavy development work, so I just may be sheltered on issues like this. Am I off the mark?
Cheers, Josh