由于(据称)未跟踪的文件导致文件覆盖的Git警告

Question

试图从git repo中提取,但获得以下输出.我认为这些文件是跟踪的(因为它们应该是),但它表明它们不是.他们不在.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

任何想法如何解决这个问题？

Answer 1

它们会在您检出的版本中进行跟踪,但不会在之前检出过的版本中进行跟踪.如果您不关心未跟踪的版本,只需将其删除即可.

如果您关心它们,请在进行rebase之前提交它们.然后,您可能必须合并作为rebase过程的一部分.