+1 for Fabio's wording. "Replace/Keep Local" is easy for me to understand.

+1000 to Chris for fixing this. I cannot understand the current labels at all. Thank you!

Dave


On Sat, Jan 23, 2016 at 12:00:56AM +0000, Fabio Niephaus wrote:
> I think that it's not only the naming but also the direction that is
> confusing. Sorry for being selfish, but I usually care about my own stuff
> more than about the stuff on the server, right?
> 
> How about:
> 
>   Keep -> 'Replace Local'
>   Reject -> 'Keep Local'
> 
> This is also what most syncing services name the two options when you
> start using them (e.g. iCloud or Google Chrome Sync).
> 
> Best,
> Fabio
> 
> -- 
> 
> On Fri, Jan 22, 2016 at 11:41 PM Chris Cunningham <cunningham.cb at gmail.com>
> 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
> >
> >

>