[Pharo-project] Monticello Merge detected conflict
Sean P. DeNigris
sean at clipperadams.com
Fri Jul 13 10:49:01 EDT 2012
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.
There are two different things shown by the merge tool, changes and
Conflicts are when something  which is changed by
the-package-you're-trying-to-merge  has also been changed in the image,
after  was saved. The version history of  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 . 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.
View this message in context: http://forum.world.st/Monticello-Merge-detected-conflict-tp4639802p4639854.html
Sent from the Pharo Smalltalk mailing list archive at Nabble.com.
More information about the Pharo-dev