[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 15:44:40 +0300 |
> Date: Sun, 05 Apr 2015 05:10:59 -0400
> From: Richard Stallman <address@hidden>
> Cc: address@hidden, address@hidden
>
> I tried to verify this by investigating what changes I stashed last
> week. But I could not tell the answer, because 'git stash show' gave
> me the output below.
It looks like you've stashed all the changes upstream that the failed
pull brought in, but failed to merge due to your local changes (in
lisp/ChangeLog) that conflicted with the changes upstream.
> Now I am concerned that when I pull again, it will reinstall all of this.
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.
- Re: VC mode and git, (continued)
- Re: VC mode and git, Harald Hanche-Olsen, 2015/04/05
- Re: VC mode and git, Harald Hanche-Olsen, 2015/04/04
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git, Lele Gaifax, 2015/04/04
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git, Lele Gaifax, 2015/04/05
- Re: VC mode and git, Richard Stallman, 2015/04/05
- Re: VC mode and git,
Eli Zaretskii <=
- Re: VC mode and git, Harald Hanche-Olsen, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Harald Hanche-Olsen, 2015/04/05
- Re: VC mode and git, Dmitry Gutov, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Richard Stallman, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Richard Stallman, 2015/04/03