emacs-devel
[Top][All Lists]
Advanced

[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: Sun, 05 Apr 2015 16:02:56 +0300

> Date: Sun, 05 Apr 2015 14:54:59 +0200
> From: Harald Hanche-Olsen <address@hidden>
> CC: address@hidden, address@hidden, address@hidden, 
>  address@hidden
> 
> > I suggest to unstash them, fix the conflict in lisp/ChangeLog, and
> > then commit all of that.  Then you should be in sync with upstream and
> > can pull again.
> 
> Yes. At risk of repeating myself: After committing, run
> 
> git diff origin/master
> 
> which should give you exactly the changes you have written, no more, no 
> less. Don't push unless the output looks sane.

Meanwhile is looks like at least some of those changes were already
pushed, as I see them on master.  So I'm no longer sure what is the
current status of Richard's local repository.



reply via email to

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