+1 So long as bugfixes for 1.5.0 consistently happen in the 1.5 branch, and get merged to trunk, to keep merges linear (oldest to newest branch), I'm in favor of branching.
-- Christopher L Tubbs II http://gravatar.com/ctubbsii On Fri, Feb 15, 2013 at 11:33 AM, David Medinets <[email protected]>wrote: > > John and Keith hashed out their differences in #accumulo. A summary of > > their proposal is that we branch 1.5 now, but hold off on introducing > tree > > conflicts in trunk (i.e. moving or renaming files or directories) to make > > merging easier until 1.5.1 is released. Presumably there will be a fair > > amount of bug fixes (and thus merging) for an x.x.0 release. > > +1 (are we voting?) >
