What is exactly a conflict when merging in Monticello?
Hi! Anyone can tell me what is a conflict? When merging, Monticello is telling me there is a conflict with a old method that hasnât changed for long. How that could be? Am I the only one to experience this? Alexandre -- _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;: Alexandre Bergel http://www.bergel.eu ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.
is the method timestamp different? different protocol? a missing/extra newline? in times past it has been hard to tell when these things happen... Dale On Tue, Aug 5, 2014 at 5:57 PM, Alexandre Bergel <alexandre.bergel@me.com> wrote:
Hi!
Anyone can tell me what is a conflict? When merging, Monticello is telling me there is a conflict with a old method that hasnât changed for long. How that could be? Am I the only one to experience this?
Alexandre -- _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;: Alexandre Bergel http://www.bergel.eu ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.
participants (3)
-
Alexandre Bergel -
Ben Coman -
Dale Henrichs