Conflicts are because of local modifications.

You can either delete the modified files or manually resolve each one.

We strongly discourage local modifications for 3xactly this reason.

Adam.

Sent from BlueMail

On 10 Jan 2019, at 14:08, Arnoldo Vidal Bravo via observium <observium@observium.org> wrote:

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?

--

Saluda cordialmente

 

observium mailing list
observium@observium.org
http://postman.memetic.org/cgi-bin/mailman/listinfo/observium