Unfortunately that doesn't appear to be an option with the way Monticello works. The megre tool, like the original, only deals with conflicts in that manner, not additions or removals. I'm happy to work with anyone that would like to improve MC here, though clearly difficult given the varieties of MC out there... Regards, Gary ----- Original Message ----- From: "Michael Robers" <mike@mjr104.co.uk> To: <Pharo-project@lists.gforge.inria.fr> Sent: Tuesday, September 08, 2009 12:55 PM Subject: Re: [Pharo-project] Merge tool bug?
Ok but I can't selectively take it or leave it? I seem to have no choice.
Thanks Mike
On 8 Sep 2009, at 10:38, "Gary Chambers" <gazzaguru2@btinternet.com> wrote:
The left-hand pane shows the version of the method in the image only if it currently belongs to the package being merged... hence the "tick" showing an new addition (cross is removal from package, right-hand pane will be blank).
I guess that in your image that method is in another package.
Regards, Gary
----- Original Message ----- From: "Michael Roberts" <mike@mjr104.co.uk> To: "Pharo-project" <pharo-project@lists.gforge.inria.fr> Sent: Monday, September 07, 2009 11:31 PM Subject: Re: [Pharo-project] Merge tool bug?
sorry....
I thought the left hand pane was always what was in the image and the right was incoming?
My method appears identical in both.
thanks, Mike
--- --- --- --- --------------------------------------------------------------------
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project
_______________________________________________ Pharo-project mailing list Pharo-project@lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project