[Pharo-project] Monticello Merge detected conflict

Sean P. DeNigris sean at clipperadams.com
Fri Jul 13 10:50:31 EDT 2012

Sean P. DeNigris wrote
> There are two different things shown by the merge tool, changes and
> conflicts...

The behavior I described is on Pharo1.4 Latest update: #14453

View this message in context: http://forum.world.st/Monticello-Merge-detected-conflict-tp4639802p4639855.html
Sent from the Pharo Smalltalk mailing list archive at Nabble.com.

More information about the Pharo-dev mailing list