[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: |
Sergey Organov |
Subject: |
Re: git pull fails with merge conflicts. How can this possibly happen? |
Date: |
Mon, 17 Nov 2014 15:38:13 +0300 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) |
Eli Zaretskii <address@hidden> writes:
[...]
> Second, too many things in Git are different, or are done differently,
> or have different effect from their namesakes in other VCSes
> (a.k.a. "have different semantics". At times, I have a distinct
> feeling that Someone(TM) made a conscious effort to confuse me by
> picking up a different semantics. Examples:
| sed -e 's/Git/Emacs/g' | sed -e 's/VCS/Editor/g'
and the result still holds. It's just that Git and Emacs have better
ways of doing things than anything else out there ;-)
--
Sergey.
- Re: git apologia, (continued)
- Re: git apologia, David Kastrup, 2014/11/17
- Re: git apologia, Achim Gratz, 2014/11/17
- Re: git apologia, Yuri Khan, 2014/11/17
- Re: git apologia, Thien-Thi Nguyen, 2014/11/18
- Re: git apologia, John Yates, 2014/11/18
- Re: git apologia, Thien-Thi Nguyen, 2014/11/18
- Re: git apologia, Andreas Schwab, 2014/11/18
- Re: git apologia, Barry Warsaw, 2014/11/18
- Re: git pull fails with merge conflicts. How can this possibly happen?,
Sergey Organov <=
- Re: git pull fails with merge conflicts. How can this possibly happen?, Eli Zaretskii, 2014/11/17
- Re: git pull fails with merge conflicts. How can this possibly happen?, David Kastrup, 2014/11/17
- Re: git pull fails with merge conflicts. How can this possibly happen?, Sergey Organov, 2014/11/17
- Re: git pull fails with merge conflicts. How can this possibly happen?, Glenn Morris, 2014/11/17
- Re: git pull fails with merge conflicts. How can this possibly happen?, Alan Mackenzie, 2014/11/18
- 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