Git没有';不允许重新设置基础,因为在没有更改的情况下,未进行更改
当我尝试Git没有';不允许重新设置基础,因为在没有更改的情况下,未进行更改,git,git-rebase,Git,Git Rebase,当我尝试git-rebase时,我看到以下内容: Cannot rebase: You have unstaged changes. Please commit or stash them. On branch xxx nothing to commit, working tree clean 当我尝试git status时,我看到以下内容: Cannot rebase: You have unstaged changes. Please commit or stash them. On
git-rebase
时,我看到以下内容:
Cannot rebase: You have unstaged changes.
Please commit or stash them.
On branch xxx
nothing to commit, working tree clean
当我尝试git status
时,我看到以下内容:
Cannot rebase: You have unstaged changes.
Please commit or stash them.
On branch xxx
nothing to commit, working tree clean
我已经试过了git reset
,git clean-fd
和git checkout.
我还可以尝试什么?我放弃了,用核弹炸了存储库:
cd..&&rm-射频和git克隆
重新定基可立即工作。您以前是否在任何文件上运行过
git update index--假定未更改或git update index--跳过工作树
?请尝试git ls files-v | grep-e'^h'-e'^S'
查找它们。不,我还没有运行这些命令。我尝试了您的git ls files
命令,但它没有返回任何结果。我试着运行git ls files-v
,似乎所有的文件都是H
。是否有任何文件在当前分支上被忽略,并且存在于工作树中,但在新的基础上提交?我试过git rebase-I HEAD~1
,但它也失败了,我上次提交时肯定没有引入任何被忽略的文件。