Git Can'；t更改分支：由于（已？）未跟踪的文件而导致合并冲突

我已经遇到了无法签出分支的问题（请参阅）。在我强制签出（

git checkout master-f

）并进行合并和标记之后，我现在想切换回开发分支。这就是我得到的：

git checkout develop
MyProject.userprefs: needs merge
error: you need to resolve your current index first

这是

git status

给出的：

On branch master
Your branch is ahead of 'origin/master' by 78 commits.
  (use "git push" to publish your local commits)
Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add/rm <file>..." as appropriate to mark resolution)

    deleted by us:   MyProject.userprefs

no changes added to commit (use "git add" and/or "git commit -a")

---

我应该简单地删除MyProject.userprefs吗？但IDE需要这样做。我应该在主分支中重新创建索引吗？

我执行了以下所述的解决方案：

现在我可以换树枝了

100644 b16bd8d4e57de7705a5a388d045fed7376a1b175 1   MyProject.userprefs
100644 ef238f895ca1b80f10cfcd45349d82df925ff482 3   MyProject.userprefs

git rm MyProject.userprefs