Git on windows: Can't switch branch after renaming a file (only changed case)
I’m working with git on windows, and I have a file in my repo, lets say “foo.txt”.
Today I wanted to rename this file to “Foo.txt” (uppercase). As suggested in this SO question, I used
git mv -f foo.txt Foo.txt, which produced the desired result. I proceeded to commit the change to my repo.
EDIT: I would like this to be a permanent change, and still be able to checkout commit that predate this change.
However, after that I encountered an error upon trying to switch branch:
# I'm on branch1 git checkout branch2 Aborting error: The following untracked working tree files would be overwritten by checkout: Foo.txt Please move or remove them before you can switch branches.
After some poking around I found that my
.git/config file had the following setting:
Changing this to true seems to fix the issue and allows me to change between branches as normal.
So regarding this, I would like to know:
- Is there any adverse effect of this setting? Should it always be true on windows? What if I’m working with other dev’s and they don’t have the same value set for this?
- Is there another way to rename the file without having to change this setting?
- Why does this happen in the first place? When I committed the change, git correctly identified that the file was in fact renamed (didn’t delete one file and then add another). So what exactly happened when I tried to switch branches?
2 Solutions collect form web for “Git on windows: Can't switch branch after renaming a file (only changed case)”
As mentioned in “Unresolvable Git error: The following untracked working tree files would be overwritten by checkout”, setting
true is a valid way to allow the checkout to proceed.
But I would prefer, as in “GIT: The following untracked working tree files would be overwritten by checkout”, to:
git addwhat I just modified (in your case,
git mvmight have already added the renamed file to the index)
git stash, saving the index
git checkout -b anotherBranch: this should work since the index is clean
git stash pop, if you want to restore the case change on that new index.
A simple (but inelegant) way to overcome this problem without having to change the config setting is to delete the file and to check it out again. In my case this allowed my changes branches as normal again.
Edit: As Avivr has pointed out, my proposed workaround doesn’t solve the problem permanently. I will still not delete this answer because it may help as a temporary hot-fix in some cases.