我正在一个Git/GitHub项目的分支上工作。在push操作后,出现了以下提示:
git push
To git@github.com:...
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:...'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again. See the 'Note about
fast-forwards' section of 'git push --help' for details.
我尝试解决这个问题,通过谷歌搜索后我找到了这一行代码:
git push --mirror
我执行了以下命令,现在似乎已经从服务器上删除了很多分支。
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:...
- [deleted] develop
+ 797beee...bafbc50 master -> master (forced update)
- [deleted] milestone
- [deleted] robot
- [deleted] strategy
* [new branch] origin/HEAD -> origin/HEAD
* [new branch] origin/develop -> origin/develop
* [new branch] origin/master -> origin/master
* [new branch] origin/milestone -> origin/milestone
* [new branch] origin/robot -> origin/robot
* [new branch] origin/robot_simulator -> origin/robot_simulator
* [new branch] origin/strategy -> origin/strategy
* [new branch] origin/vision -> origin/vision
您能告诉我发生了什么,以及我如何撤消我所做的更改吗? (如果我删除了那些分支)
git push --help
(也就是man git-push
),在其中一个章节中它提到了这个“问题”,并描述了处理它的主要方法... - Cascabel