[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: VC mode and git
From: |
Robert Pluim |
Subject: |
Re: VC mode and git |
Date: |
Wed, 01 Apr 2015 17:25:02 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
Eli Zaretskii <address@hidden> writes:
> Once you fix all the conflicts, invoke "git commit" to complete the
> merge (which "git pull" normally does automatically, but didn't do due
> to the conflicts). After that, you should "git push" to update the
> repository on Savannah with your local commits.
Just out of curiosity: what is supposed to be the way to perform that
commit from inside Emacs? vc-next-action on a file where I've resolved
the conflicts gets me:
fatal: cannot do a partial commit during a merge.
(I don't normally use vc-* at all)
Robert
- Re: VC mode and git, (continued)
- Re: VC mode and git, Richard Stallman, 2015/04/02
- Re: VC mode and git, Steinar Bang, 2015/04/03
- Re: VC mode and git, Eli Zaretskii, 2015/04/03
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/03
- Re: VC mode and git, Eli Zaretskii, 2015/04/03
- Re: VC mode and git, Harald Hanche-Olsen, 2015/04/03
- Re: VC mode and git, Eli Zaretskii, 2015/04/03
- Re: VC mode and git, Steinar Bang, 2015/04/03
- Re: VC mode and git, Eli Zaretskii, 2015/04/03
Re: VC mode and git, Eli Zaretskii, 2015/04/01
- Re: VC mode and git,
Robert Pluim <=
- Re: VC mode and git, Eli Zaretskii, 2015/04/01
- Re: VC mode and git, Robert Pluim, 2015/04/02
- Re: VC mode and git, Eli Zaretskii, 2015/04/02
- Re: VC mode and git, Robert Pluim, 2015/04/02
- Re: VC mode and git, Richard Stallman, 2015/04/03
- Re: VC mode and git, Eli Zaretskii, 2015/04/03
- Re: VC mode and git, Richard Stallman, 2015/04/04
- Re: VC mode and git, Eli Zaretskii, 2015/04/04
Re: VC mode and git, Steinar Bang, 2015/04/03
Re: VC mode and git, Richard Stallman, 2015/04/04