osx - Can't switch branch: untracked working tree file because of case-insensitivity? -
i want merge develop branch master branch , thougt this:
git checkout master git merge --no-ff develop git tag -a 1.0.0
but on checkout get
git checkout master error: following untracked working tree files overwritten checkout: project/resources/someimage.png please move or remove them before can switch branches. aborting
but have file someimage.png in develop branch , seems git has somehow old file. git case-sensitive? on local folder there no such file.
shoud use git rm -f filename
?
edit:
now tried delete file, get
fatal: pathspec './project/resources/someimage.png' did not match files
now i'll try checkout master branch -f.
i forced checkout this
git checkout master -f
and local differences should ignored. think through deleting , re-inserting image there problem in index or so.
Comments
Post a Comment