Puzzled about merge conflicts.

[Óscar Fuentes]

The conflicts signaled by "bzr merge" are confusing me. There is a very
simple scenario: the local branch .bzrignore file is:

./build

The other branch .bzrignore file is:

./build
./tests/log

Subversion merges this allright, without conflict. Bazaar, however,
signals a contents conflict, leaves the original .bzrignore file
untouched, and creates .bzrignore.OTHER and .bzrignore.BASE. I've tried
different merge algorithms, but that didn't made a difference.

BTW, executing "bzr remerge" produces a funny effect:

$ ls  .bzrignore*
.bzrignore  .bzrignore.BASE  .bzrignore.OTHER

$ bzr remerge
Contents conflict in .bzrignore.OTHER
Conflict adding id to .bzrignore.OTHER.OTHER.  Unversioned existing file .bzrignore.OTHER.
Contents conflict in tests/cases/thread/thread-wrapper.wra.OTHER
Conflict adding id to tests/cases/thread/thread-wrapper.wra.OTHER.OTHER.  Unversioned existing file tests/cases/thread/thread-wrapper.wra.OTHER.
Contents conflict in tests/wrappers/defdatems.lp0.OTHER
Conflict adding id to tests/wrappers/defdatems.lp0.OTHER.OTHER.  Unversioned existing file tests/wrappers/defdatems.lp0.OTHER.
6 conflicts encountered.

$ ls  .bzrignore*
.bzrignore  .bzrignore.OTHER.BASE  .bzrignore.OTHER.OTHER