git 流 : fatal: Index contains uncommited changes. 中止

Question

我想使用 git flow 完成一项功能，但我收到一个 fatal error :fatal: Index contains uncommited changes。中止。

>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 中的说明进行操作消息和

use "git reset HEAD <file>..." to unstage