How to merge files if branches have different directory nesting?

Question

git

There is a main branch where the files that are being worked on are located in the root directory,
and there is another where the hierarchy is such my-working-files / and HereFiles, I work in the main branch and then I need to transfer the changes to the second branch, how to do this correctly?

Answer 1

That's right - do not make branches with a different structure. First time I've heard of doing that.
A dockerfile can be moved upstream and configured to work with upstream project hierarchies.