Text conflict did not create .BASE file - is that expected?

Nicholas Allen nick.allen at onlinehome.de
Mon Mar 28 10:08:58 UTC 2011


Hi,

I just tried to merge a branch into my branch. Bazaar warned me that a
criss cross merge was encountered and I received text conflicts. For one
of the files Bazaar created the .OTHER and .THIS files but not the .BASE
file. Bazaar shows that file as having a "Text conflict".

Is that a bug or is there some reason for that?

Cheers,

Nick



More information about the bazaar mailing list