[Pharo-dev] 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 ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.