git remote add other-origin ssh://other.com/project.git
git fetch other-origin
git branch --set-upstream-to=other-origin/other-main main
git pull other-origin other-main --allow-unrelated-histories
git mergetool <file-with-conflicts>
... do your pushes and pulls, then to switch back to origin...
git branch --set-upstream-to=origin/main main