> > Does foo have the same id in both ? (bzr file-id foo) See below.. > > If I look in the file in .bzr/inventory before the merge, both > > branches have the file (but with two different file_id's of course), No (and I checked again just to be sure) I also get other merge conflicts, but only normal text conflicts within files, in the same merge. But they look ok. /Erik