'bzr remerge' often report about conflict when it is not

Alexander Belchenko bialix at ukr.net
Wed Oct 4 11:09:09 BST 2006


I notice that command 'bzr remerge' often report about conflict in file
when in reality there is no conflicts. When I merge branches I sometimes
find useful to use diff3 merge-type to 'remerge'. Sometimes it do good
job and I get normally merged file without conflicts and without markers
(<<<<< / >>>>>>) in the file. Even files .BASE/.THIS/.OTHER deleted as
result of this operation. But after remerge complete it prints that
there is conflict in my file:

Text conflict in file.txt
1 conflicts encountered.

So I need manually re-check file content for markers, does not found it
and manually run 'bzr resolve file.txt'.

Is this intended behaviour? Why for 'remerge' don't clear conflicts flag
for successfully remerged files?

--
Alexander





More information about the bazaar mailing list