Question

Having a strange problem in my gits. There is nothing to add, yet it won’t let me switch or add the files suggested to add.

git status
# On branch oop
nothing to commit (working directory clean)

git checkout LIVE
error: The following untracked working tree files would be overwritten by checkout:
    folder/file.js
    folder/file2.js
Please move or remove them before you can switch branches.
Aborting

Even after doing git add folder/file.js;git add folder/file2.js, the same results occur.

Anyone have any idea what’s going on? There is no .gitignore file…

Strangely, before, I could not add these files in, so I had to rename, add, rename them to get them in the repo (as suggested by this answer.

Could it be related to the fact that this folder used to be its own repo within this repo? I deleted all hidden folders (like .git) within this folder.

Answer 1

Not sure what the problem was, but I did the following to fix it:

• deleted the folder (and saved a backup)
• git add -u; // stage deleted files
• git commit -m '...'
• copied backup files into repo’s folder
• git add . // stage new files
• git commit -m '...'

did this in both branches and it seemed to fix it so far..