Question

我以错误的方式做到了这一点但却陷入困境。

我有一个git repo我正在工作并离开了一段时间，在一个阶段我不得不重置我的机器。我忘记了回购并且正在开发一个新站点并开始使用新的git。我试图把这个新的本地仓库推到遥控器但是出错了。

以下是我使用的命令。

git init
git add .
git commit -m 'new wordpress site'
git remote add origin "url_of_previous_site"
git push

// I get the following error
// fatal: The current branch master has no upstream branch.
// To push the current branch and set the remote as upstream, use

// "git push --set-upstream origin master"
// I run that with the following message

! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'url_of_previous_site'
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.
error: failed to push some refs to 'url_of_previous_site'

// I tried the git pull and pushed again but got the same error

Answer 1

git push --force会强制将您的本地仓库同步到远程（同时重写遥控器上的一些不兼容的历史记录 - 这就是您需要强制标记的原因）

Answer 2

在执行git pull之前，您必须添加和提交。然后你修复可能的冲突。添加，再次提交，最后推送。现在你的工作将在遥控器上正确合并。

尝试将Git推送到远程时出错

2 个答案: