git flow:致命:索引包含未经修改的更改.中止

Question

我想使用git flow完成一个功能,但是我得到一个致命的错误: fatal: Index contains uncommited changes. Aborting.

>git --version
git version 1.8.3.msysgit.0

>git flow feature list
* google-oauth

>git branch
  develop
* feature/google-oauth
  master

>git flow feature finish google-oauth
fatal: Index contains uncommited changes. Aborting.

>git status
warning: LF will be replaced by CRLF in package.json.
The file will have its original line endings in your working directory.
# On branch feature/google-oauth
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   app.js

Answer 1

看起来您需要提交更改(如果您想保留它们)... git flow feature finish不会为您执行此操作.

一个简单的:git commit -m "my commit message"应该做的伎俩.

如果您不想保留更改.您需要按照git status消息中的说明进行操作

用" git reset HEAD <file>..."来取消