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: VC mode and git Date: Fri, 03 Apr 2015 14:32:52 +0300 Message-ID: <83oan5phuj.fsf@gnu.org> References: <87384qzxqy.fsf@igel.home> <83bnjen71r.fsf@gnu.org> <871tk6538w.fsf@gnu.org> <838ueezgyk.fsf@gnu.org> <878ueejnjz.fsf@uwakimon.sk.tsukuba.ac.jp> <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <551A59F1.3060602@math.ntnu.no> <86384lciin.fsf@dod.no> <86r3s1acxv.fsf@dod.no> <83twwxpsbg.fsf@gnu.org> <551E508F.3060609@math.ntnu.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: ger.gmane.org 1428060806 1321 80.91.229.3 (3 Apr 2015 11:33:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Apr 2015 11:33:26 +0000 (UTC) Cc: sb@dod.no, emacs-devel@gnu.org To: Harald Hanche-Olsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 03 13:33:14 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 1Ydzqb-0000F4-5s for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 13:33:13 +0200 Original-Received: from localhost ([::1]:33670 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydzqa-000242-E0 for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 07:33:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdzqO-00023s-5K for emacs-devel@gnu.org; Fri, 03 Apr 2015 07:33:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdzqK-00050T-W3 for emacs-devel@gnu.org; Fri, 03 Apr 2015 07:33:00 -0400 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:36474) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdzqK-00050N-Ny for emacs-devel@gnu.org; Fri, 03 Apr 2015 07:32:56 -0400 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NM800400ABGPN00@mtaout27.012.net.il> for emacs-devel@gnu.org; Fri, 03 Apr 2015 14:27:46 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM800N9BAIARB60@mtaout27.012.net.il>; Fri, 03 Apr 2015 14:27:46 +0300 (IDT) In-reply-to: <551E508F.3060609@math.ntnu.no> 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:184829 Archived-At: > Date: Fri, 03 Apr 2015 10:34:23 +0200 > From: Harald Hanche-Olsen > CC: Steinar Bang , emacs-devel@gnu.org >=20 > Eli Zaretskii wrote: > > The situation is that a pull was done and failed because of > > conflicting local commits. The merge part of the pull in this ca= se is > > already aborted. >=20 > But if so, where are all the modified files in the index coming fro= m? My=20 > hypothesis is that they come from the merge. More precisely, I expe= ct=20 > they are exact copies from origin/master. Yes, I think so too. But then they are already in the index, and "gi= t commit" after resolving the conflicts should finish the merge by creating a merge-commit with all the changes that were pulled in all those files. > > All Richard needs to do is resolve the conflicts one > > by one (AFAIU, he only had one to begin with, in a ChangeLog file= ), > > and then do: > > > > git commit > > git push >=20 > Agreed, though I don't think he should push without doing a sanity = check=20 > first. Basically, =E2=80=9Cgit diff origin/master=E2=80=9D to chec= k that he is merely=20 > committing his own changes. Yes, that's always a Good Thing.