'bzr resolve FILE' says no conflict while 'bzr conflicts' says there is one

Error occured after removing (bzr rm) a directory in the local branch. Trying to push the committed changes endet in few conflicts where one was a "Contents conflict" of a file located in the removed directory.

Bazaar created two files 'file.ext.BASE' and 'file.ext.OTHER'. Renaming or similar actions didn´t work as these files weren´t versioned anymore.

'bzr resolve url/file.ext' didn´t also work (still after renaming one file of the two generated ones back to the original name) as it says "there is no conflict".
'bzr conflicts" still showed a conflict with the file.

After some tries the following solution worked.
'bzr rm url/file.ext' (on the file that was renamed back to the original file): deleted the file from the working tree
'bzr resolve url/file.ext' : didn´t throw any error so it resolved the conflict
'bzr commit' : also committed without errors
'bzr push' : was able to push the remote directory to the new version.

Steps that put me to the problem:
1. The working tree was a svn-repository at first. So the first thing was to import the svn-repository into a bazaar branch.
2. I´ve then added some additional files that were missing in the svn-repository before the import. (also committed the files)
3. Then I´ve pushed the directory to our severs location. But the push didn´t upload the working tree (which is odd, but exactly the result I want, saved me to use a shared repository without trees or remove the working tree), it just pushed the history to the server.
4. Then another user created a local branch of the servers branch. Created new files and changed some.
5. After he finished I added the newly created files. In the log I´ve seen that it also added some cache files what I didn´t want. So I updated the ignore file to ignore the hole cache folder. Looking at the log told me that it already was versioned in the svn-repo.
6. Because of that I´ve used 'bzr rm cache --keep' to remove the hole folder.
7. Then I´ve committed the changes and tried to push the branch back to the server which run me into the error ...