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: Sat, 15 Nov 2014 18:21:28 +0200 Message-ID: <83a93sfn93.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> <87zjbsn236.fsf@fencepost.gnu.org> <83k32wg0q2.fsf@gnu.org> <87mw7smsvr.fsf@fencepost.gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416068533 22498 80.91.229.3 (15 Nov 2014 16:22:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 16:22:13 +0000 (UTC) Cc: emacs-devel@gnu.org To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 17:22:06 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 1Xpg6v-0000m0-1i for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 17:22:05 +0100 Original-Received: from localhost ([::1]:41011 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpg6u-0005yx-Lf for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 11:22:04 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpg6m-0005ys-F7 for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:22:02 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xpg6g-0002JN-IM for emacs-devel@gnu.org; Sat, 15 Nov 2014 11:21:56 -0500 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:39771) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpg6a-0002Il-5L; Sat, 15 Nov 2014 11:21:44 -0500 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NF300D008GYVW00@mtaout24.012.net.il>; Sat, 15 Nov 2014 18:14:10 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF3005LZ93MVN90@mtaout24.012.net.il>; Sat, 15 Nov 2014 18:14:10 +0200 (IST) In-reply-to: <87mw7smsvr.fsf@fencepost.gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.180 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:177196 Archived-At: > From: David Kastrup > Cc: emacs-devel@gnu.org > Date: Sat, 15 Nov 2014 15:38:00 +0100 > > Eli Zaretskii writes: > > >> From: David Kastrup > >> 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.