qt无法添加现有文件到工程_如果自上次提交以来已将新文件添加到项目中,则Qt Creator中的Git存储将失败...

自从上次提交以来我刚刚对项目中的文件进行了更改时,git stash工作正常.

但是,如果我自上次提交以来还向项目添加了新文件,则会因此错误而失败：

C:\Program Files\Git\cmd\git.exe stash save QtCreator 2013-01-08T12:06:51

Cannot stash in “C:\MyProject”: error: Entry ‘NewFile.cpp’ not uptodate. Cannot merge.

Cannot save the current worktree state

为什么它会显示此错误,如果我已将新文件添加到项目中,是否有办法存储我的更改？

编辑

这是git status的输出

# On branch master

# Changes to be committed:

# (use "git reset HEAD ..." to unstage)

#

# new file: NewFile.cpp

#

# Changes not staged for commit:

# (use "git add ..." to update what will be committed)

# (use "git checkout -- ..." to discard changes in working directory)

#

# modified: MyFile.cpp

#

# Untracked files:

# (use "git add ..." to include in what will be committed)

#

# MyProject.pro.user