[squeak-dev] Monticello merge - what does Keep/Reject mean again?

Chris Cunningham cunningham.cb at gmail.com
Fri Jan 22 23:41:40 UTC 2016


So, once again, I am bitten by these button labels.  They just don't speak
to me.

>From back in 2013, there was a description by Nice that explained it thus:
"If you say keep, then you accept the incoming version to replace your
version.
If you say reject, then refuse the incoming version and prefer to keep your
own version."

Then back in 2015, another discussion about what these values mean with
several options thrown out.  But it looks like we still have Keep and
Reject - which still confuses me.

Maybe we could just relabel them the way Nice suggested:
    Keep -> 'Keep Incoming'
    Reject -> 'Reject Incoming'
?  Maybe also update the balloon help to take Nice's exact words?

I'll push a change later tonight/tomorrow to the InBox unless I hear back
that this is a horrible idea.

Thanks,
cbc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.squeakfoundation.org/pipermail/squeak-dev/attachments/20160122/be88d7cb/attachment.htm


More information about the Squeak-dev mailing list