Merge repos maintaining history

Merge_git_repos.txt

# You will lose any untracked files so a new checkout is probably wise

git checkout --orphan <branch_name>
git rm -rf .
git pull <other repo>
# clean up file structure. For example remove packaging metadata files
git merge master
git checkout master
git merge <branch_name>