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 17:40:45 +0300 Message-ID: <83bnh4ydci.fsf@gnu.org> References: <20150527165006.32357.80915@vcs.savannah.gnu.org> <87egm13yrm.fsf@gmx.de> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1432824091 9795 80.91.229.3 (28 May 2015 14:41:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 May 2015 14:41:31 +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 16:41:16 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 1Yxyzk-0004u1-3D for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 16:41:16 +0200 Original-Received: from localhost ([::1]:59371 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxyzj-0006vE-GA for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 10:41:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxyzS-0006uM-R3 for emacs-devel@gnu.org; Thu, 28 May 2015 10:41:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxyzN-0008BW-IM for emacs-devel@gnu.org; Thu, 28 May 2015 10:40:58 -0400 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:33851) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxyzN-0008Ar-3f for emacs-devel@gnu.org; Thu, 28 May 2015 10:40:53 -0400 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NP200900DN2PQ00@mtaout27.012.net.il> for emacs-devel@gnu.org; Thu, 28 May 2015 17:36:06 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NP2001U8DW5RG80@mtaout27.012.net.il>; Thu, 28 May 2015 17:36:06 +0300 (IDT) In-reply-to: <87egm13yrm.fsf@gmx.de> 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.183 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:186904 Archived-At: > From: Michael Albinus > Date: Thu, 28 May 2015 10:13:49 +0200 > Cc: emacs-devel@gnu.org > > - I've tried to push, but I was said that it's not possible because the > previous merge wasn't finished. You should have finished it (whatever that means; you didn't show enough info about that to tell what else needed to be done). > - ERROR: I've reverted all open changes in my Emacs repository. > > - I've pushed. Not sure how it is possible, nor what "all open changes in my repository" means here. I think it's important to analyze and understand what happened, in order for you to make sure you don't make such mistakes in the future. > I must claim, that I'm still in fight with git. After a merge conflict, > it let's *other* items edited I have never touched, and I often don't > know what to do :-( What exactly do you mean by "it let's *other* items edited I have never touched"? Can you show an example?