On Sun, Feb 14, 2010 at 2:03 PM, Sean Owen <sro...@gmail.com> wrote: > Do they even conflict? So much of this is javadoc and line wrap changes. >
I don't know if they conflict, but in my patch, there was more than javadocs and line wraps - if I import new stuff, and there was import reordering, svn complains to me about trivial conflicts I have to correct myself. Ditto if I add a method argument, but at the same time, some reordering of modifiers on that method happens. > 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. > I give up. This discussion is really getting to annoy me for some reason. -jake