[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git is screwed
From: |
Richard Stallman |
Subject: |
Re: git is screwed |
Date: |
Tue, 24 Mar 2015 11:54:52 -0400 |
[[[ To any NSA and FBI agents reading my email: please consider ]]]
[[[ whether defending the US Constitution against all enemies, ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]
> It will abort the merge if it can't be done using fast-forward.
> (In other words, if the local branch has diverged from the remote.)
I understand that. What should I do when that occurs?
Can someone tell me a full recipe for how to repair lisp/ChangeLog
(perhaps, merge it by hand) and how to get the new version into
the real repository?
--
Dr Richard Stallman
President, Free Software Foundation
51 Franklin St
Boston MA 02110
USA
www.fsf.org www.gnu.org
Skype: No way! See stallman.org/skype.html.
- git is screwed, Richard Stallman, 2015/03/22
- Re: git is screwed, Andreas Schwab, 2015/03/22
- 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 <=
- 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
- Re: git is screwed, Steinar Bang, 2015/03/26
- Re: git is screwed, Stefan Monnier, 2015/03/26
- Re: git is screwed, Eli Zaretskii, 2015/03/26
- Re: git is screwed, Steinar Bang, 2015/03/26