git - 从我的 git 存储库中永久删除文件后出错

Question

我是 Git 的新手，所以我不确定我是否工作得很好。

我已经使用以下命令从我的 git 存储库中删除了一个文件:

git filter-branch --tree-filter 'rm -f application.log' HEAD

一切顺利，但是当我尝试推送我的分支时，我收到了这条消息:

$ git filter-branch --tree-filter 'rm -f application.log' HEAD
Rewrite a700a3de38f804b875a4dafabf01eaa90260e573 (1313/1313)
Ref 'refs/heads/master' was rewritten

$ git push origin master
To git@github.com:myuser/myrepo.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:myuser/myrepo.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.

我该如何解决这个问题？

谢谢!

Answer 1

出现此错误的原因是您破坏性地更改了历史记录。使用 git push -f origin master 来“强制推送”您新重写的历史记录。