[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

I can't commit a simple change

From: Richard Stallman
Subject: I can't commit a simple change
Date: Sat, 21 Dec 2013 16:19:30 -0500

I tried to commit a documentation change in simple.el and lisp/ChangeLog.
I got an error message saying there are conflicts.  (There are no conficts
in those files.)

bzr conflicts gave me this output.

Conflict: can't delete info because it is not empty.  Not deleting.
Conflict adding file lisp/dired.el.BASE.  Moved existing file to 
Conflict adding file lisp/dired.el.OTHER.  Moved existing file to 
Conflict adding file lisp/dired.el.THIS.  Moved existing file to 

I don't understand any of this.  What do I have to do?
And why is any of this relevant to the change I want to commit?

Dr Richard Stallman
President, Free Software Foundation
51 Franklin St
Boston MA 02110
www.fsf.org  www.gnu.org
Skype: No way! That's nonfree (freedom-denying) software.
  Use Ekiga or an ordinary phone call.

reply via email to

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