[Top][All Lists]

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

bzr commit raises a weird conflict

From: Bastien
Subject: bzr commit raises a weird conflict
Date: Tue, 09 Apr 2013 09:50:21 +0200
User-agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.3.50 (gnu/linux)

I wanted to push a tiny docstring bugfix (bug#14163) but could not.

"~$ bzr commit" complains about a conflict.

"~$ bzr conflicts" yields:
  Conflict: can't delete leim/ja-dic because it is not empty.  Not deleting.

I first ran "~$ make maintainer-clean" before trying to commit,
because I did build Emacs from this directory.

How can I resolve this "conflict"?

I know it safer to build from a dedicated branch, and to use a clean
branch for commits, but still, I don't understand what's wrong.

Thanks for any help,


reply via email to

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