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 13:30:29 +0200 Message-ID: <83k32wg0q2.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1416051080 22482 80.91.229.3 (15 Nov 2014 11:31:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 11:31:20 +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 12:31:13 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 1XpbZQ-0000bO-F2 for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 12:31:12 +0100 Original-Received: from localhost ([::1]:39896 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpbZP-0006b2-Tf for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 06:31:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpbZH-0006ak-0z for emacs-devel@gnu.org; Sat, 15 Nov 2014 06:31:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpbZ6-0000OT-2w for emacs-devel@gnu.org; Sat, 15 Nov 2014 06:31:02 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:48376) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpbYz-0000NV-Ky; Sat, 15 Nov 2014 06:30:45 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NF200J00VY4YH00@a-mtaout20.012.net.il>; Sat, 15 Nov 2014 13:30:44 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NF200J3FVZ7X720@a-mtaout20.012.net.il>; Sat, 15 Nov 2014 13:30:44 +0200 (IST) In-reply-to: <87zjbsn236.fsf@fencepost.gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:177167 Archived-At: > 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.