Question

I’m using git-svn, and I’m trying to run git svn rebase.

I get the error:

Your local changes to the following files would be overwritten by checkout:
<filename>
Please, commit your changes or stash them before you can switch branches.

I have previously run git update-index --assume-unchanged <filename>, and made changes to the file, but I’ve now run git update-index --no-assume-unchanged <filename> to get rid of that.

git status doesn’t report any changes and git stash says there’s nothing to stash.

I have checked that the file is not in .gitignore or .git/info/exclude

How can I debug this problem further?

Answer 1

It turns out that I had the skip-worktree bit set, so I needed to run

git update-index --no-skip-worktree <filename>

I found this out by running

git ls-files -v | grep "^[^H]"

(Or git ls-files -v | where { $_ -match "^[^H]"} with Windows Powershell)

Typing git help ls-files explained what the output meant.