[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: |
Stephen J. Turnbull |
|
Subject: |
Re: git pull fails with merge conflicts. How can this possibly happen? |
|
Date: |
Sat, 15 Nov 2014 22:43:46 +0900 |
David Kastrup writes:
> > What's so hard about list semantics for an Emacs developer?
>
> A list is a high-level concept.
Jeez, David, this is an *Emacs* ML, you could at least assume that the
semantics of Emacs lists (built of conses, and including "dotted"
lists) are meant. As Eli did.
- Re: git apologia [was: git pull fails with merge conflicts. ...], (continued)
- 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
- Git's victory and an entertaining irony, Stephen J. Turnbull, 2014/11/15
- Re: Git's victory and an entertaining irony, Eric S. Raymond, 2014/11/16
- Re: git apologia [was: git pull fails with merge conflicts. ...], Andreas Schwab, 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. ...], 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 <=