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 10:46:43 +0300 Message-ID: <83twwxpsbg.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428047229 20965 80.91.229.3 (3 Apr 2015 07:47:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Apr 2015 07:47:09 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 03 09:47:01 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 1YdwJe-0006hW-EJ for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 09:46:58 +0200 Original-Received: from localhost ([::1]:32904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdwJd-0007rP-K3 for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 03:46:57 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdwJa-0007rG-P3 for emacs-devel@gnu.org; Fri, 03 Apr 2015 03:46:55 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdwJV-0002nO-QJ for emacs-devel@gnu.org; Fri, 03 Apr 2015 03:46:54 -0400 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:39573) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdwJV-0002nG-Hp for emacs-devel@gnu.org; Fri, 03 Apr 2015 03:46:49 -0400 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NM700N00ZNSOW00@mtaout25.012.net.il> for emacs-devel@gnu.org; Fri, 03 Apr 2015 10:42:05 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM800G740257H80@mtaout25.012.net.il>; Fri, 03 Apr 2015 10:42:05 +0300 (IDT) In-reply-to: <86r3s1acxv.fsf@dod.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.181 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:184815 Archived-At: > From: Steinar Bang > Date: Fri, 03 Apr 2015 09:27:56 +0200 > > >>>>> Richard Stallman : > > >> Yes, only much better. If the merge went wrong in some way, just > >> redo it. > > > Sorry, I do not understand you. > > I think he means that, if you've committed or stashed your changes > before pulling, you can abort the pull's merge, and start again, without > losing your changes. > > If you haven't saved your local changes, aborting the merge and starting > again isn't so easy. I don't understand why there's a need to use stash in this case. The situation is that a pull was done and failed because of conflicting local commits. The merge part of the pull in this case is already aborted. 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 (In general, one needs to "git add" each file whose conflicts were resolved, but resolving the conflicts in Emacs should have invoked "git add" automatically when each files with resolved conflicts is saved, so no "git add" commands should be required at all.) So why would Richard need to use "stash" in this situation? It sounds like an unnecessary complication. Am I missing something?