Conflict in file supposed to be out of version control

Krilin Wantun kwnz01 at yahoo.es
Fri Jan 14 17:06:17 UTC 2011


Hello, can anybody tell me what does this mean?

conflicts:
   Contents conflict in admin/imagenes/menu_usuario/logo_menu.png

It appears when I do "bzr status", plus a number of unknown list of 
files and directories.

This file I've done bzr -ignore, bzr -remove and bzr -remove --force an 
d it's still there, it's supposed to be out of the version control but 
it appears there, how can I get it out from control version? and how can 
I resolve this conflict?

This is what I get trying to resolve:

 >bzr resolve
0 conflict(s) auto-resolved.
Remaining conflicts:
Contents conflict in admin/imagenes/menu_usuario/logo_menu.png

 >bzr resolve admin/menu_usuario/logo_menu.png
admin/menu_usuario/logo_menu.png does not exist

 >bzr resolve admin/menu_usuario/logo_menu.png
admin/menu_usuario/logo_menu.png does not exist


Thank you



More information about the bazaar mailing list