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

Levente Uzonyi leves at caesar.elte.hu
Sun Jan 24 01:47:25 UTC 2016


It's easy to find out what they do, when you think like you're deciding 
about changes, which is actually what you're doing.
You either Keep the selected change or Reject it.

Levente

On Fri, 22 Jan 2016, Chris Cunningham wrote:

> 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
> 
>


More information about the Squeak-dev mailing list