无法使用git中止rebase

Question

我开始变基，但不得不结束它。但是，每当我输入git rebase --abort时，我都会得到以下内容：

Elaines-MacBook-Pro:team byrne$ git rebase --abort
No rebase in progress?
Elaines-MacBook-Pro:team byrne$ 

知道怎么摆脱这个吗？我尝试了各种方法，但似乎没有任何工作。有很多冲突文件，因此必须中止。

git status：

Elaines-MacBook-Pro:team byrne$ git status
On branch newrebased
Your branch and 'origin/newrebased' have diverged,
and have 3 and 23 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
You have unmerged paths.
  (fix conflicts and run "git commit")

Changes to be committed:

    modified:   client/app/post.html

Unmerged paths:
  (use "git add <file>..." to mark resolution)

    both modified:   client/app/app.js
    both modified:   client/app/post.controller.js

Elaine-MacBook-Pro:team byrne$ 

更新：我做了git reset --mixed，似乎已经成功了。但是，我遇到了另一个问题。

Elaines-MacBook-Pro:team byrne$ git checkout master
error: The following untracked working tree files would be overwritten by checkout:
    client/app/services/constants.development.js
Please move or remove them before you can switch branches.
Aborting
Elaines-MacBook-Pro:team byrne$ git stash
No local changes to save
Elaines-MacBook-Pro:team byrne$ 

我该怎么办？