我遇到了 git-flow 的问题。
我编辑了很多文件,但我不想提交所有文件,所以我只提交了一些文件到我的本地存储库。
因此,当我尝试将存储库推送到主存储库时,它告诉我
! [rejected]
master -> master (non-fast-forward)
error: failed to push some refs to <snip>
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 想让我在之前合并
error: Your local changes to <snip> would be overwritten by merge. Aborting.
Please, commit your changes or stash them before you can merge.
但我不想提交这些,我不知道如何让它们恢复到所有更改之前的状态。