如果文件夹结构已更改，如何将分支集成到主干？

I need to intergrate a branch into the trunk but the folder hierarchy of my trunk changed in the meantime. I should still be able to merge sub-folders which preserve the original structure, but when I try I get an error.I need to intergrate a branch into the trunk bu