> On Jan 24, 2016, at 6:31 AM, Bert Freudenberg <bert at freudenbergs.de> wrote:
> 
>> On 23.01.2016, at 17:37, Eliot Miranda <eliot.miranda at 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 -
> 
> 
>