无法将存储库文件推送到远程存储库 (GitHub)

Question

我是 Git & GitHub 的新手，

我有一个名为 HackerRank 的本地存储库 我有一个远程存储库 https://github.com/xxx/HackerRank.git

现在我想将我的本地存储库推送到远程存储库。

我用过以下命令

git remote add hacker https://github.com/xxx/HackerRank.git
git push hacker master

它抛出了错误

To https://github.com/xxx/HackerRank.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/xxx/HackerRank.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

所以现在我尝试使用以下命令从我的远程存储库中提取数据

git pull hacker master
From https://github.com/xxx/HackerRank
 * branch            master     -> FETCH_HEAD
 * [new branch]      master     -> hacker/master
fatal: refusing to merge unrelated histories

现在我尝试使用以下命令获取数据

$ git fetch hacker
From https://github.com/xxx/HackerRank
 * [new branch]      master     -> hacker/master

现在我尝试使用以下命令合并

$ git merge hacker/master
fatal: refusing to merge unrelated histories

请推荐我。

Answer 1

您可以尝试将本地分支变基到远程 master 分支并推送它：git pull --rebase hacker master

您也可以尝试使用 git merge --squash hacker/master

进行挤压合并