On 05.01.2011, at 12:56, Levente Uzonyi wrote:

> On Tue, 4 Jan 2011, commits at source.squeak.org wrote:
> 
>> A new version of KernelTests was added to project The Inbox:
>> http://source.squeak.org/inbox/KernelTests-cmm.169.mcz
>> 
>> ==================== Summary ====================
>> 
>> Name: KernelTests-cmm.169
>> Author: cmm
>> Time: 4 January 2011, 2:54:20.261 pm
>> UUID: 63f1b572-d2e1-4ee7-a764-70b0cc9f760b
>> Ancestors: KernelTests-ul.168
>> 
>> Unmerged KernelTests-ar.171.
> 
> This won't work, because images already have KernelTests-ar.171. If you move this to the Trunk, the update mechanism will try to merge it. Since there are conflicts, it won't work automatically. The proper way to do it is to remove/revert the changes starting from KernelTests-ar.171 and save that as a new version IMHO.

+1

- Bert -