But you should pay attention about the order because you do not rely on
the MC load order.
Stef
On Nov 3, 2009, at 11:04 PM, Lukas Renggli wrote:
> For cherry-picking you display the changes from your image to the code
> to be merged and from the context menu you choose the individual items
> to load. Afterwards "Adopt" the manually merged version.
>
> Lukas
>
> 2009/11/3 Gary Chambers <
[hidden email]>:
>> Not that I've found. Would be nice but goes pretty deep into the
>> guts of
>> MC's merge processes. If it were easy I'd have done it already.
>> Worth a
>> go with a small team and/or anyone who's had a go at improving
>> MC.I'd be
>> happy to help out.
>>
>>
>>
>> On Tue, 2009-11-03 at 16:07 -0300, Hernan Wilkinson wrote:
>>> Is there a way to control what the Monticello's Merge tool merges? I
>>> mean, if there is a conflict you can decide what to do, but
>>> sometimes
>>> there are no conflicts (like for example removing a class) and there
>>> is no way to tell it not to merge that...
>>>
>>> Thanks
>>> Hernan.
>>>
>>> _______________________________________________
>>> Pharo-project mailing list
>>>
[hidden email]
>>>
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project>>
>>
>> _______________________________________________
>> Pharo-project mailing list
>>
[hidden email]
>>
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project>>
>
>
>
> --
> Lukas Renggli
>
http://www.lukas-renggli.ch>
> _______________________________________________
> Pharo-project mailing list
>
[hidden email]
>
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project_______________________________________________
Pharo-project mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
Locked
