Two repos of the same project with different histories (unrelated from the git point of view). I need to merge them into one repo and remember histories of both.
The main problem is that the one of the repos one additional directory.
repo1 ---DIR----[project dirs]
repo2 ---[project dirs]
The project dirs are almost the same.
I have tried to move the directories, create dummy branches, then merge unrelated histories and then merge. But it never see the conflicts - it just replaces files using one of the repos.
Is it possible to merge two separate repos?