[Top][All Lists]

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

Re: VC mode and git

From: Eli Zaretskii
Subject: Re: VC mode and git
Date: Fri, 03 Apr 2015 10:46:43 +0300

> From: Steinar Bang <address@hidden>
> Date: Fri, 03 Apr 2015 09:27:56 +0200
> >>>>> 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.

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?

reply via email to

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