git不同的仓库合并

git关联远程仓库上遇到的小问题
换了电脑新建的本地仓库并没有clone，后来想和原本git上的仓库关联后发现不能pull也不能push
提示

hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.

根据提示和网上的回答用了
git config pull.rebase false
git pull
除了443连不上GitHub以外报了
fatal: refusing to merge unrelated histories
拒绝合并不相关的历史&#