[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git is screwed
|
From: |
Andreas Schwab |
|
Subject: |
Re: git is screwed |
|
Date: |
Sun, 22 Mar 2015 15:53:27 +0100 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.4.91 (gnu/linux) |
Richard Stallman <address@hidden> writes:
> I edited lisp/ChangeLog and tried to commit it with C-x v v.
> That gave me the error message
>
> fatal: cannot do a partial commit during a merge.
>
> I am now stuck. I don't know what a "merge" is; it is certainly
> nothing I asked to do.
>
> How can I get this unwedged?
Try 'git merge --abort'.
Andreas.
--
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
- git is screwed, Richard Stallman, 2015/03/22
- Re: git is screwed,
Andreas Schwab <=
- Message not available
- Message not available
- Re: git is screwed, Sam Gwydir, 2015/03/23
- Re: git is screwed, Harald Hanche-Olsen, 2015/03/23
- Re: git is screwed, Richard Stallman, 2015/03/24
- Re: git is screwed, Harald Hanche-Olsen, 2015/03/24
- Re: git is screwed, Richard Stallman, 2015/03/26
- Re: git is screwed, John Wiegley, 2015/03/26
- Re: git is screwed, Richard Stallman, 2015/03/26
- Re: git is screwed, Harald Hanche-Olsen, 2015/03/26
- Re: git is screwed, Harald Hanche-Olsen, 2015/03/26