[kepler-dev] [Bug 4311] - Build system appears to lock if there is a conflict upon update

[bugzilla-daemon at ecoinformatics.org]

http://bugzilla.ecoinformatics.org/show_bug.cgi?id=4311





------- Comment #1 from jones at nceas.ucsb.edu  2009-08-26 14:36 -------
Conflicts are common when multiple people work on a file.  This needs to get
fixed for 2.0.   Need to provide a way for people to provide input to answer
how to resolve the conflict.