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: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Thu, 28 May 2015 19:52:21 +0300 Message-ID: <83vbfcwsoq.fsf@gnu.org> References: <20150527165006.32357.80915@vcs.savannah.gnu.org> <87egm13yrm.fsf@gmx.de> <83bnh4ydci.fsf@gnu.org> <87a8wo3fyk.fsf@gmx.de> <83382gybkc.fsf@gnu.org> <87vbfc1yz0.fsf@gmx.de> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1432831974 18464 80.91.229.3 (28 May 2015 16:52:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 May 2015 16:52:54 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 28 18:52:45 2015 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 1Yy12y-0001MD-Ed for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 18:52:44 +0200 Original-Received: from localhost ([::1]:60042 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yy12x-0002MR-Lu for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 12:52:43 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yy12l-0002MB-SX for emacs-devel@gnu.org; Thu, 28 May 2015 12:52:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yy12h-0001ki-RR for emacs-devel@gnu.org; Thu, 28 May 2015 12:52:31 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:54533) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yy12h-0001kZ-JM for emacs-devel@gnu.org; Thu, 28 May 2015 12:52:27 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NP200F00JXUH500@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Thu, 28 May 2015 19:52:26 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NP200FQNK7EHI00@a-mtaout22.012.net.il>; Thu, 28 May 2015 19:52:26 +0300 (IDT) In-reply-to: <87vbfc1yz0.fsf@gmx.de> 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:186922 Archived-At: > From: Michael Albinus > Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org > Date: Thu, 28 May 2015 17:52:19 +0200 > > Eli Zaretskii writes: > > > Btw, when you say you've committed tramp.el after resolving the > > conflicts, what exactly did you do? Did you commit only that file, or > > did you commit all the files that were ready to be committed? > > I've touched only tramp.el (and likely, I did something like "git reset > lisp/net/tramp.el" first). The other files I've simply reverted in > Emacs' vc-dir buffer, via "C-x v u", IIRC. That's a mistake. You were in the middle of a failed merge, with most of the new stuff successfully merged and ready to be committed. What you needed to do is commit all of them, including tramp.el, after resolving the conflicts, and making sure "git status" shows only files that are staged for commit.