git rebase错误地检测到rebase的局部变化

Question

我正在尝试做一个interive rebase squash。它声称我有本地更改未提交，但事实并非如此。有什么建议么？

$ git status 
On branch 859423-Modulize-JS-Build-Files 
nothing to commit, working tree clean 


$ git pull origin 859423-Modulize-JS-Build-Files 
From https://tfs/marketing.marketplace 
* branch    859423-Modulize-JS-Build-Files -> FETCH_HEAD 
Already up-to-date. 

$ git rebase -i develop 
error: Your local changes to the following files would be overwritten by merge: 
     MarketPlace.Web/Marketplace.WebUI/css/am/site.css 
Please commit your changes or stash them before you merge. 
Aborting 
fatal: cherry-pick failed 
Could not apply 8b499ab98b4f23ad30a3b8b2d5bafd9695f8405f... fully working 

Answer 1

您可以尝试查看切换分支后问题是否仍然存在。

git checkout develop 
git checkout 859423-Modulize-JS-Build-Files 
git rebase develop 

见edit from "git cherry-pick says local changes exist, but git status says nothing"