有几篇文章讨论了从 GIT 中删除文件或目录 - 但它们并没有解释如何将这些更改推送到主存储库中。
例如,这可以很好地删除目录,但是当我尝试将此更改推送到主 Git 存储库时,我被拒绝:
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to '/repo/project.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again. See the 'non-fast forward'
section of 'git push --help' for details.
将其实际推送到主仓库并实际删除该目录的最后一步是什么?