Hopefully I'll get some time in the new year to complete the diff tool to allow in-method merging (composited from either alternative along with manual editing). I'll take Damien's suggestion first to label the left & right panes with their origin. Regards, Gary. ----- Original Message ----- From: "Simon Denier" <Simon.Denier@inria.fr> To: <pharo-project@lists.gforge.inria.fr> Sent: Wednesday, December 17, 2008 3:50 PM Subject: [Pharo-project] About the merging tool and "affordance"

Hi all

With Stef today, we kept scratching our head about how the new merging tool works. Sure it looks cool, but it is not 100% intuitive. A few suggestions:

- above the compare panels, show which version is displayed (or which one is the current, which one is the incoming) - the direction of the arrow left/right, depending on whether we keep the current or the incoming, seems wrong. Inverse it?

-- Simon

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

Perhaps the Polymorph groupbox could be used to good effect! Regards, Gary. ----- Original Message ----- From: David Mitchell To: Pharo-project@lists.gforge.inria.fr Sent: Tuesday, December 30, 2008 4:35 PM Subject: Re: [Pharo-project] About the merging tool and "affordance" Labeling panes would be a nice change for Pharo generally! On Tue, Dec 30, 2008 at 9:18 AM, Gary Chambers <gazzaguru2@btinternet.com> wrote: Hopefully I'll get some time in the new year to complete the diff tool to allow in-method merging (composited from either alternative along with manual editing). I'll take Damien's suggestion first to label the left & right panes with their origin. Regards, Gary. ----- Original Message ----- From: "Simon Denier" <Simon.Denier@inria.fr> To: <pharo-project@lists.gforge.inria.fr> Sent: Wednesday, December 17, 2008 3:50 PM Subject: [Pharo-project] About the merging tool and "affordance" > Hi all > > With Stef today, we kept scratching our head about how the new merging > tool works. Sure it looks cool, but it is not 100% intuitive. A few > suggestions: > > - above the compare panels, show which version is displayed (or which > one is the current, which one is the incoming) > - the direction of the arrow left/right, depending on whether we keep > the current or the incoming, seems wrong. Inverse it? > > -- > Simon > > > > > _______________________________________________ > 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