From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sergey Organov Newsgroups: gmane.emacs.devel Subject: Re: git pull fails with merge conflicts. How can this possibly happen? Date: Mon, 17 Nov 2014 15:38:13 +0300 Message-ID: References: <20141114183737.GB3168@acm.acm> <5466517B.50705@porkrind.org> <20141114215404.GD3168@acm.acm> <838ujchods.fsf@gnu.org> <8761egx1k2.fsf@uwakimon.sk.tsukuba.ac.jp> <83sihkg2ds.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1416227943 3201 80.91.229.3 (17 Nov 2014 12:39:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 17 Nov 2014 12:39:03 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 17 13:38:56 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XqLa4-0000pm-0e for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 13:38:56 +0100 Original-Received: from localhost ([::1]:47547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqLa3-00085u-MJ for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 07:38:55 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqLZg-000802-UG for emacs-devel@gnu.org; Mon, 17 Nov 2014 07:38:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqLZb-00038M-0m for emacs-devel@gnu.org; Mon, 17 Nov 2014 07:38:32 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:40792) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqLZa-000381-QT for emacs-devel@gnu.org; Mon, 17 Nov 2014 07:38:26 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XqLZZ-0000eB-Pi for emacs-devel@gnu.org; Mon, 17 Nov 2014 13:38:25 +0100 Original-Received: from 89.175.180.246 ([89.175.180.246]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 17 Nov 2014 13:38:25 +0100 Original-Received: from sorganov by 89.175.180.246 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 17 Nov 2014 13:38:25 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 17 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 89.175.180.246 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177398 Archived-At: Eli Zaretskii 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.