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

Hi,

to me Fabios suggestion makes clear what the buttons do (I took a note because I never knew). Clearer than the other suggestions. I like it _very_ clear.

Cheers,

Herbert

Am 23.01.2016 um 17:37 schrieb Eliot Miranda:

Hi Fabio, Chris,

On Jan 22, 2016, at 4:00 PM, Fabio Niephaus <lists@fniephaus.com mailto:lists@fniephaus.com> 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'

Let's try and search for more candidates. The two word ones are clunky and long. Keep is horrible because it conflicts with the sense of "keep what's mine". But some other duals are (where left is Replace Local and right is Keep Local)

Import vs Exclude Accept vs Reject Merge vs Ignore Advance vs Remain Approve vs Disapprove

More of a stretch but may trigger thought: Infect vs Quarantine Ingest vs Refuse

and the question mark at the end of each suggestion is implicit ;-)

Any other suggestions?

...

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@gmail.com mailto:cunningham.cb@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

On Jan 24, 2016, at 6:31 AM, Bert Freudenberg bert@freudenbergs.de wrote:

...

On 23.01.2016, at 17:37, Eliot Miranda eliot.miranda@gmail.com wrote:

Any other suggestions?

“Keep mine” / “Accept incoming”

… or shorter:

“Mine” / “Incoming"

+1. The two word ones are too long for button labels.

But I much prefer "Mine" and "Theirs" because they're both short, both a pair, both intuitive and both common to another dvcs.

… and make the balloon help a little longer “Keep the version in the image, rejecting the incoming change” “Accept the incoming change, replacing the version in my image”

• Bert -