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: merging emacs-24 Date: Fri, 28 Nov 2014 10:27:05 +0200 Message-ID: <83oarrn31i.fsf@gnu.org> References: <87a93eavwt.fsf@lifelogs.com> <87wq6hap7v.fsf@lifelogs.com> <87y4qx76hh.fsf@lifelogs.com> <87r3wpmmf6.fsf@wanadoo.es> <87oart74q5.fsf@lifelogs.com> <61sih5uww3.fsf@fencepost.gnu.org> <878uiw7q5n.fsf@lifelogs.com> <87r3woa6rd.fsf@engster.org> <87fvd4niev.fsf@uwakimon.sk.tsukuba.ac.jp> <878uiwngu9.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1417163251 4486 80.91.229.3 (28 Nov 2014 08:27:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 28 Nov 2014 08:27:31 +0000 (UTC) Cc: deng@randomsample.de, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 28 09:27:24 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 1XuGtf-0005YV-Ld for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 09:27:23 +0100 Original-Received: from localhost ([::1]:42991 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuGtf-0005Vo-4y for ged-emacs-devel@m.gmane.org; Fri, 28 Nov 2014 03:27:23 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49538) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuGtV-0005T6-TN for emacs-devel@gnu.org; Fri, 28 Nov 2014 03:27:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XuGtP-0002y9-Vk for emacs-devel@gnu.org; Fri, 28 Nov 2014 03:27:13 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:45758) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XuGtP-0002y1-OM for emacs-devel@gnu.org; Fri, 28 Nov 2014 03:27:07 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NFQ00000Q0Z1Y00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Fri, 28 Nov 2014 10:27:06 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NFQ0006RQ552C00@a-mtaout22.012.net.il>; Fri, 28 Nov 2014 10:27:06 +0200 (IST) In-reply-to: <878uiwngu9.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:178400 Archived-At: > From: "Stephen J. Turnbull" > Date: Fri, 28 Nov 2014 12:29:02 +0900 > > Stephen J. Turnbull writes: > > David Engster writes: > > > > I think the easiest way to avoid this is to merge the remote branch > > > instead of the local tracking one. > > > > It is mathematically impossible to merge a remote branch, > > Oops, did you mean "git pull" here? I think he meant merging origin/emacs-24 after "git pull", as opposed to merging emacs-24 (which requires "git checkout" followed by "git pull").