Merge new branch with uncorrelated history into repository subdirectory using Git

Question

There are 2 branches in a repository: master and my_branch. my_branch is newly pushed branch with contents from another repository and uncorrelated history. I would like to merge my_branch into master, however:

git checkout master
git merge master my_branch

would merge them on the root level which is not what I want.

I would like to merge the root directory contents of my_branch with subdirectory of the root directory of master.

Would anyone be able to advise me on how to proceed on this?

question from:https://stackoverflow.com/questions/65908116/merge-new-branch-with-uncorrelated-history-into-repository-subdirectory-using-gi

Answer 1

Waitting for answers