Comment 3 for bug 674019

The conflict was not resolved. We were surprised that the (.OTHER) was a pending addition and were trying to remove it because we didn't want it to be added. Later we realized that "resolve" essentially does the delete in this case. It was just different from a text conflict, where .BASE, .THIS and .OTHER files aren't "pending additions", so we thought something was wrong and were trying to fix it.

Now that we know that the "addition" is just misleading and we can ignore it, we are acting accordingly. However, in learning this process, I was quite surprised that both files were deleting, which, in essence, deleted our good file where we had just finished the manual resolving of the conflicts (without having said "resolve" yet). So loosing that work was quite frustrating, and I figured I would file the bug about the two file deletion surprise.

BTW, we did bzr resolve filename in the end, as opposed to filename.OTHER, if that makes any difference. After doing so, filename.OTHER is listed in the bazaar explorer dialog as added, missing.