Re: git pull fails with merge conflicts. How can this possibly happen?

[Eli Zaretskii]

> From: David Kastrup <address@hidden>
> Cc: address@hidden
> Date: Sat, 15 Nov 2014 15:38:00 +0100
> 
> Eli Zaretskii <address@hidden> writes:
> 
> >> From: David Kastrup <address@hidden>
> >> Date: Sat, 15 Nov 2014 12:19:09 +0100
> >> 
> >> I'd recommend that you keep away from @~n if you don't want to confuse
> >> other Emacs users.  HEAD~n will be more meaningful to people.
> >
> > It's a lot more to type, though.
> 
> English is a lot more to type than APL, but last time I looked, the
> point of communication was not using the minimal amount of characters
> that one can claim "are still correct".

I'm not talking about communicating with humans, so this aspect
doesn't bother me in this case.