You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@river.apache.org by si...@apache.org on 2010/12/13 08:38:37 UTC

svn commit: r1045029 - /incubator/river/site/trunk/content/river/coding.mdtext

Author: sijskes
Date: Mon Dec 13 07:38:36 2010
New Revision: 1045029

URL: http://svn.apache.org/viewvc?rev=1045029&view=rev
Log:
CMS commit to river by sijskes

Modified:
    incubator/river/site/trunk/content/river/coding.mdtext

Modified: incubator/river/site/trunk/content/river/coding.mdtext
URL: http://svn.apache.org/viewvc/incubator/river/site/trunk/content/river/coding.mdtext?rev=1045029&r1=1045028&r2=1045029&view=diff
==============================================================================
--- incubator/river/site/trunk/content/river/coding.mdtext (original)
+++ incubator/river/site/trunk/content/river/coding.mdtext Mon Dec 13 07:38:36 2010
@@ -25,6 +25,12 @@ Tabs are not used. Default indentation i
 Contributors are advised to read <http://www.oracle.com/technetwork/java/codeconv-138413.html> 
 and try to adhere as much as possible to these conventions.
 
+## Reformatting
+If the reformatting involves a large part of the code, 
+a clearly labeled 'reformatting' commit in between is recommended. 
+Keeping your reformatting changes limited, 
+reduces the change of merging conflicts by your fellow committers.
+
 ## Older sources
 We do not actively search and reformat source files 
 that are not formatted according to this convention.