The whitespace issues would probably account for 95% of your conflicts.
You would need to reduce the amount of time you are implementing your
cleanups so that normal development doesn't generate so many conflicts with
the whitespace cleanup.
So automate as much of the fixes as possible (i.e. sed scripts to remove
trailing whitespace, whitespace-around issues, etc). Once you have that
working well, schedule time with developers to get the changes in, and then
execute the script on the latest code and commit.
I would write a commit-hook to scan for these issues going forward and
reject the commit if whitespace issues are detected. These kinds of issues
are easier dealt with at commit time rather than during a review/test cycle
which would require the commit to be amended.
Once you have the whitespace cleaned up, the other types of issues are more
design issues or doc changes which probably won't have such a high
frequency of conflict.
--carl
On Mon, Aug 26, 2013 at 12:46 AM, Ronald Roskens <rosk...@elfin.net> wrote:
> I've added a wiki page about running the unit tests and issues that might
> crop up when running them.
>
> http://www.opennms.org/wiki/Running_Unit_Tests
>
> Ronny Trommer had shown me his SonarQube server setup during devjam, and I
> thought that was a pretty cool idea. So I also included a section on
> running the unit tests under SonarQube for checkstyle/findbugs/pmd
> analysis. I didn't have to commit any pom updates for running things under
> SonarQube which was pretty nice. I've uploaded my configuration files from
> sonar for those, and also included a link to the backup taken of the sonar
> configuration.
>
> The top 7 most violated rules accounted for almost 130,000 of the ~181,000
> issues created:
> Regexp Singleline Java: 29,372 (white space at the end of the line)
> Final Parameters 25,075 (suggestion to mark a parameter as final)
> Design For Extension 23,918 (suggestion to mark a method as final,
> abstract, or empty)
> Whitespace Around 13,616 (missing whitespace around certain characters)
> Javadoc Style 13,564 (ex: first sentence should end with a period.)
> Javadoc Method 12,250 (ex: missing @param tag or a javadoc comment)
> Javadoc Variable 11,910 (ex: missing a javadoc comment)
>
> I've set up a local git branch to work through fixing these issues, but
> have found that when merging changes in from master I end up with a lot of
> conflicts to resolve. Anybody got any suggestions on how to make the
> merging go easier?
>
> Ron
>
>
> ------------------------------------------------------------------------------
> Introducing Performance Central, a new site from SourceForge and
> AppDynamics. Performance Central is your source for news, insights,
> analysis and resources for efficient Application Performance Management.
> Visit us today!
> http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
> _______________________________________________
> Please read the OpenNMS Mailing List FAQ:
> http://www.opennms.org/index.php/Mailing_List_FAQ
>
> opennms-devel mailing list
>
> To *unsubscribe* or change your subscription options, see the bottom of
> this page:
> https://lists.sourceforge.net/lists/listinfo/opennms-devel
>
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
Please read the OpenNMS Mailing List FAQ:
http://www.opennms.org/index.php/Mailing_List_FAQ
opennms-devel mailing list
To *unsubscribe* or change your subscription options, see the bottom of this
page:
https://lists.sourceforge.net/lists/listinfo/opennms-devel
