bzr remove problem

Alex Greif alex.greif at
Thu Nov 23 19:52:16 GMT 2006

here is what I did with v0.9 of bazaar:
1. on a branch I removed a folder (_statistik) with its subfolders and files
2. committed
3. pushed the changes to another branch

on the other branch I get conflicts like:
  Conflict adding files to mod_python-3.2.8/scripts/_statistik.  Not deleting.
  Conflict adding files to mod_python-3.2.8/scripts/_statistik/model.
Not deleting.
  Conflict adding files to mod_python-3.2.8/scripts/_statistik/test.
Not deleting.

How can I resolve the conflicts?


More information about the bazaar mailing list