Dario Trussardi wrote

Now the conflict is detected only if the method in the image belongs at the same method category of the relative method in the package.

Hi Dario, There are two different things shown by the merge tool, changes and conflicts. Conflicts are when something [1] which is changed by the-package-you're-trying-to-merge [2] has also been changed in the image, after [2] was saved. The version history of [1] has branched, and you have to choose which branch to follow. IIUC, what you're describing is that a method's category has changed between the image [2]. This may or may not be a conflict, but should appear in the changes list on the left side of the merge tool. If you right-click on an item there, you will see options to cherry-pick what gets loaded. HTH, Sean -- View this message in context: http://forum.world.st/Monticello-Merge-detected-conflict-tp4639802p4639854.h... Sent from the Pharo Smalltalk mailing list archive at Nabble.com.