Since it was introduced yesterday morning, every merge I've done had at least 1 conflict file, usually multiple. And one to many merges per file (which is how I missed that one yesterday).
On Thu, Mar 7, 2013 at 10:57 AM, Keith Turner <[email protected]> wrote: > On Thu, Mar 7, 2013 at 10:49 AM, John Vines <[email protected]> wrote: > > I've been getting unnecessary merge conflicts because of this change. At > > the very least, I would like to see it reverted until we release 1.5 > > Or maybe make the change after 1.5.1. Based on past experience, there > will likely be a good bit of merge activity from 1.5 to 1.6 until at > least the first 1.5 bug fix release. > > Curious, how much extra time do this add to merging for you? I do not > have a good feeling for how well this will be handled automatically. > Did it cause conflicts for most of the edits you made in 1.5? > > > > > > > On Thu, Mar 7, 2013 at 10:44 AM, Keith Turner <[email protected]> wrote: > > > >> On Wed, Mar 6, 2013 at 10:23 AM, David Medinets > >> <[email protected]> wrote: > >> > I have a free day due to snowfall and while this is a fairly silly > >> > rule, writing a short script to rule all the java files through sed > >> > should be fairly painless. As part of this change, I will commit a > >> > one-rule checkstyle.xml file which just runs this 'no spaces at end of > >> > line' rule. Over time, more rules can be added to that align with the > >> > Accumulo community's style guidelines. > >> > > >> > Any objection? > >> > >> Whats the benefit of doing this? How will it impact merges from 1.5 > >> to 1.6? Should this be done for thrift generated code? > >> >
