We have Subscription Edition of observium with Version  18.10.9472 (stable). We trying of update to Version 19.1.9661 by svn update, and we are getting many conflicts. we can resolve all this once? or we must solve each one?
--