AurelioDeRosa

git checkout -b otherrepo-master master
git pull https://github.com/otherrepo/my-repo-name.git master
git checkout master
git cherry-pick --strategy=recursive -X theirs <commit-hash>
git log
git branch -D otherrepo-master
git push origin master