dcavey/Clustering — Issue #17: Update conflicts for constant values in FindClusters.java
Author: dcavey
Created: 2012-02-06 08:20:12+00:00
State: open
Labels: Low priority

Each time I pull a new version I get a merge conflict on FindClusters.java, regarding the constants for which I have a "all-in" version and others choose other options. This makes me loose 10 mins each time.
Can we invent a mechanism that avoids this conflict?
E.g. Have a temporary text file, not included in the versioning (somewhere on C:\WorkStorageIFS\input ) with which the constants can be changed. Or something more elegant still?