From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: git pull fails with merge conflicts. How can this possibly happen? Date: Sat, 15 Nov 2014 15:38:00 +0100 Message-ID: <87mw7smsvr.fsf@fencepost.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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416062327 26294 80.91.229.3 (15 Nov 2014 14:38:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 14:38:47 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 15:38:40 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 1XpeUq-0006Mp-BW for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 15:38:40 +0100 Original-Received: from localhost ([::1]:40749 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpeUp-0000U6-Tt for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 09:38:39 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpeUm-0000Tw-5k for emacs-devel@gnu.org; Sat, 15 Nov 2014 09:38:37 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpeUj-00036j-Fq for emacs-devel@gnu.org; Sat, 15 Nov 2014 09:38:36 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:49097) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpeUj-00036b-Cc for emacs-devel@gnu.org; Sat, 15 Nov 2014 09:38:33 -0500 Original-Received: from localhost ([127.0.0.1]:56272 helo=lola) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpeUi-0007jW-Ig; Sat, 15 Nov 2014 09:38:33 -0500 Original-Received: by lola (Postfix, from userid 1000) id 1FFB6E0BAF; Sat, 15 Nov 2014 15:38:00 +0100 (CET) In-Reply-To: <83k32wg0q2.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 15 Nov 2014 13:30:29 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:177181 Archived-At: 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". -- David Kastrup