From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: git pull fails with merge conflicts. How can this possibly happen? Date: Mon, 17 Nov 2014 18:05:41 +0200 Message-ID: <83389hdd7u.fsf@gnu.org> 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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416240400 23914 80.91.229.3 (17 Nov 2014 16:06:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 17 Nov 2014 16:06:40 +0000 (UTC) Cc: emacs-devel@gnu.org To: Sergey Organov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 17 17:06:34 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 1XqOoz-00021B-DH for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 17:06:33 +0100 Original-Received: from localhost ([::1]:48630 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqOoy-0008V2-UD for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 11:06:32 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqOoS-0008HV-E0 for emacs-devel@gnu.org; Mon, 17 Nov 2014 11:06:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqOoK-00087c-Ow for emacs-devel@gnu.org; Mon, 17 Nov 2014 11:06:00 -0500 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:45245) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqOoK-000874-9h for emacs-devel@gnu.org; Mon, 17 Nov 2014 11:05:52 -0500 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0NF600200XXY9400@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Mon, 17 Nov 2014 18:05:50 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF6002RFY1Q3180@a-mtaout23.012.net.il>; Mon, 17 Nov 2014 18:05:50 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.175 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:177435 Archived-At: > From: Sergey Organov > Date: Mon, 17 Nov 2014 15:38:13 +0300 > > > 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 ;-) I use Emacs for more than 20 years. If I used Git for so long, it's highly probable that the above would have never been written. Moreover, the first programmer's editor I ever used, before I switched to Emacs, was an Emacs clone, so I never needed to unlearn anything even when I started using Emacs. As for nomenclature, Emacs is different because it did a ground-breaking job: there was no "prior art" to follow at the time. Git, OTOH, could have used the widely adopted terminology and semantics, but instead deliberately chose not to. Doing things better doesn't need a drastic change in terminology. And I don't want to even start comparing the quality of the Emacs documentation with that of Git. So no, the result doesn't hold, not for me anyway.