Do they even conflict? So much of this is javadoc and line wrap changes. Would it not be reasonable, per this discussion, to say these patches ought to be updated to more or less match Lucene style, to the extent they don't? we've mentioned being more vigilant going forward.
That's exactly what these merge conflicts would be -- highlight exactly the work to be done. This action avoids exactly this problem later -- oh, can you please undo the style fixes you added along with patch X since it broke my patch Y. Yeah, shouldn't have but it'd be really inconvenient to break it in the next few weeks... etc. On Sun, Feb 14, 2010 at 9:59 PM, Jake Mannix <jake.man...@gmail.com> wrote: > Not true: Ted's SGD patch is going in 0.4, as is Zhendong's Pegasos > impl, MAHOUT-279, etc. Anything marked 0.4 has a patch. > > -jake >
