merge history from one repo to another with conflicts code example

Example: how to merge two repositories in github

git merge master-holder --allow-unrelated-histories