[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git pull fails with merge conflicts. How can this possibly happen?
From: |
Eli Zaretskii |
Subject: |
Re: git pull fails with merge conflicts. How can this possibly happen? |
Date: |
Sat, 15 Nov 2014 18:21:28 +0200 |
> 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.
- Re: git pull fails with merge conflicts. How can this possibly happen?, (continued)
- Re: git pull fails with merge conflicts. How can this possibly happen?, David Caldwell, 2014/11/14
- Re: git pull fails with merge conflicts. How can this possibly happen?, Alan Mackenzie, 2014/11/14
- Re: git pull fails with merge conflicts. How can this possibly happen?, Yuri Khan, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, Eli Zaretskii, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, Stephen J. Turnbull, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, Eli Zaretskii, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, David Engster, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, David Kastrup, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, Eli Zaretskii, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, David Kastrup, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?,
Eli Zaretskii <=
- Re: git pull fails with merge conflicts. How can this possibly happen?, Stephen J. Turnbull, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, Eli Zaretskii, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, David Kastrup, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, David Kastrup, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, Stephen J. Turnbull, 2014/11/15
- git apologia [was: git pull fails with merge conflicts. ...], Stephen J. Turnbull, 2014/11/15
- Re: git apologia [was: git pull fails with merge conflicts. ...], Eli Zaretskii, 2014/11/15
- Re: git apologia [was: git pull fails with merge conflicts. ...], Stephen J. Turnbull, 2014/11/15
- Re: git apologia [was: git pull fails with merge conflicts. ...], David Kastrup, 2014/11/15
- Git's victory and an entertaining irony, Eric S. Raymond, 2014/11/15