Will have a look. Not encountered an organisation conflict before. You can, of course, select the conflict manually from the tree and choose from there... Regards, Gary ----- Original Message ----- From: "Stéphane Ducasse" <stephane.ducasse@inria.fr> To: "Pharo Development" <Pharo-project@lists.gforge.inria.fr> Sent: Thursday, March 19, 2009 9:13 PM Subject: [Pharo-project] Could not merge changes... DNU

PSMCmergePatchMorph>>selectNextConflict "Select the next conflict after the current selection, if any."

|next def| next := self nextConflict ifNil: [^self]. def := next remoteDefinition ifNil: [next localDefinition]. self changed: {#changes. #openPath. next targetClassName asString. def selector asString}

def = a MCOrganizationDefinition(#(#'System-Object Events')) and does not understand selector

_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project