试图从git repo中获取,但获取以下输出。我认为这些文件被跟踪(如他们应该),但它表明它们不是。他们不在.gitignore。我大约有5-10分支落后。由于(据说)未跟踪文件导致文件覆盖的Git警告
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
任何想法如何解决这个问题?
git merge没有'-f'选项 –
@Jamie,true。 git pull的确如此,但你说得对,它不适用(似乎只适用于获取部分)。 –