[Gnu-arch-users] star-merge problem

[Alex Ng]

Could someone please help me with this problem?

I have a main development branch. I branched off a while back and made
various changes on this sub-branch. On the main branch, other work was
carried out which included the addition of a new directory.

Now, when I try to star-merge my changes from the sub-branch back into
the main branch, the merge somehow tries to remove the new directory
in the main branch!

Why is it doing this and how do I get around it?

Thanks in advance,

Alex