emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: VC mode and git


From: Steinar Bang
Subject: Re: VC mode and git
Date: Fri, 03 Apr 2015 09:27:56 +0200
User-agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt)

>>>>> Richard Stallman <address@hidden>:

>> 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.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]