[squeak-dev] Monticello merge - what does Keep/Reject mean again?
cunningham.cb at gmail.com
Sun Jan 24 19:34:52 UTC 2016
Ok, starting to look at the code. Should these name changes also apply to
the top level buttons, currectly called 'Rest Local' and 'Rest Remote'?
Or, should the bottom buttons reflect that word choice - Local and Remote?
One argument against it is that I usually work off of a local directory -
so both are 'local' - but that is an easy fix for my thinking.
On Sun, Jan 24, 2016 at 11:31 AM, Chris Cunningham <cunningham.cb at gmail.com>
> On Sun, Jan 24, 2016 at 10:41 AM, Eliot Miranda <eliot.miranda at gmail.com>
>> On Sun, Jan 24, 2016 at 10:06 AM, Vaidotas Didžbalis <vaidasd at gmail.com>
>>> let's change labels from 'old: ' to 'existing: ', and 'new: ' to
>>> 'pending: '.
>> +1. 'current' is a little shorter than 'existing', 'extant' shorter
>> still, but a little unusual. But I love 'pending' because it doesn't
>> presuppose age, and sometimes one is merging something older than the
>> existing change.
> 'current' I like (mine is better - unless it isn't - it's just what was
> 'pending' is ok - but I would forget what it means in about a year.
> 'incoming' is less forgettable.
> And the baloon help definitely needs to be updated.
> I'm not signing up yet (until I figure out how hard it is), but I would
> also love to have the two button color-coded to show which code in the diff
> pane relates to which button. Same with the author initials/dates. That
> would help significantly in reducing the confusion as well. Not mention
> let us change the colors - and I right that the red code is the proposed
> new code, and the blue crossed out code is the code going away? Why those
> colors? But that I'll leave for others to debate - if there is any desire.
>> best, Eliot
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Squeak-dev