From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Fri, 03 Apr 2015 09:27:56 +0200 Organization: Probably a good idea Message-ID: <86r3s1acxv.fsf@dod.no> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1428046079 4696 80.91.229.3 (3 Apr 2015 07:27:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Apr 2015 07:27:59 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 03 09:27:54 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 1Ydw1B-0001Jh-6p for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 09:27:53 +0200 Original-Received: from localhost ([::1]:32869 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydw1A-0002my-C2 for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 03:27:52 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydw17-0002mc-EG for emacs-devel@gnu.org; Fri, 03 Apr 2015 03:27:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ydw14-0004lz-82 for emacs-devel@gnu.org; Fri, 03 Apr 2015 03:27:49 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:54573) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydw14-0004lb-1J for emacs-devel@gnu.org; Fri, 03 Apr 2015 03:27:46 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Ydw12-0001Dr-73 for emacs-devel@gnu.org; Fri, 03 Apr 2015 09:27:44 +0200 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 03 Apr 2015 09:27:44 +0200 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 03 Apr 2015 09:27:44 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 13 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:v3E4GxzV9kC3FfA3SoCn5JnyoZ0= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:184812 Archived-At: >>>>> 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.