尝试从git仓库拉取,但是得到以下输出。我认为这些文件被跟踪(应该是这样的),但它指示它们没有被跟踪。它们不在.gitignore中。我距离分支大约有5-10次提交。
git pull --rebase origin master
From github.com:user/Project
* branch master -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
error: The following untracked working tree files would be overwritten by checkout:
mountdoom/protected/models/UserHelper.php
mountdoom/protected/models/UserRegistrationForm.php
mountdoom/protected/runtime/state.bin
mountdoom/protected/views/site/register.php
Please move or remove them before you can switch branches.
Aborting
could not detach HEAD
有什么方法可以解决这个问题吗?