Re: [Pharo-dev] What is exactly a conflict when merging in Monticello?

[Ben Coman]

Alexandre Bergel 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 ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;. Are you using git on different platforms?  Let me know if you are not. Its a random shot in the dark and I don't want to cast dispersions unnecessarily. https://help.github.com/articles/dealing-with-line-endings cheers -ben