[Top][All Lists]

[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: Sun, 22 Mar 2015 23:25:28 -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. ]]]

  > Try 'git merge --abort'.

Thanks, but I got

error: Entry 'lisp/ChangeLog' not uptodate. Cannot merge.
fatal: Could not reset index file to revision 'HEAD'.

I also tried  git merge --abort lisp/ChangeLog
and got the same error.

Dr Richard Stallman
President, Free Software Foundation
51 Franklin St
Boston MA 02110
www.fsf.org  www.gnu.org
Skype: No way! See stallman.org/skype.html.

reply via email to

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