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 <code>git mv -f foo.txt Foo.txt</code>, 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: <pre class="prettyprint"><code># 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. </code></pre> After some poking around I found that my <code>.git/config</code> file had the following setting: <pre class="prettyprint"><code>[core] ignorecase=false </code></pre> 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: <ol> <li>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? </li> <li>Is there another way to rename the file without having to change this setting? </li> <li>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?</li> </ol> Thanks!

As mentioned in "Unresolvable Git error: The following untracked working tree files would be overwritten by checkout", setting <code>core.ignorecase</code> to <code>true</code> 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: <ul> <li> <code>git add</code> what I just modified (in your case, <code>git mv</code> might have already added the renamed file to the index)</li> <li> <code>git stash</code>, saving the index</li> <li> <code>git checkout -b anotherBranch</code>: this should work since the index is clean</li> <li> <code>git stash pop</code>, if you want to restore the case change on that new index.</li> </ul>

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:

[core]  
    ignorecase=false

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?

Thanks!

Is git branch name case sensitive?

The Windows and macOS file systems are case-insensitive (but case-preserving) by default. Most Linux filesystems are case-sensitive. Git was built originally to be the Linux kernel's version control system, so unsurprisingly, it's case-sensitive.

How do you force change branches?

Force a Checkout You can pass the -f or --force option with the git checkout command to force Git to switch branches, even if you have un-staged changes (in other words, the index of the working tree differs from HEAD ). Basically, it can be used to throw away local changes.

How do I change a branch that ignores changes?

you can do git checkout -m <branch-name> to merge conflicts and checkout to the branch and resolve conflicts yourself, or git checkout -f <branch-name> to ignore changes.

Can you rename a branch in git?

The git branch command lets you rename a branch. To rename a branch, run git branch -m <old> <new>. “old” is the name of the branch you want to rename and “new” is the new name for the branch.

As mentioned in "Unresolvable Git error: The following untracked working tree files would be overwritten by checkout", setting core.ignorecase to 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 add what I just modified (in your case, git mv might 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.

Git on windows: Can't switch branch after renaming a file (only changed case)

Tags:

git

rename

case-sensitive

file-rename

ignore-case

avivr

People also ask

1 Answers

VonC

Recent Activity

Donate For Us

Git on windows: Can't switch branch after renaming a file (only changed case)

Tags:

git

rename

case-sensitive

file-rename

ignore-case

avivr

People also ask

1 Answers

VonC

Related questions

Recent Activity

Donate For Us