![]() When checking out the files, the second one "wins" and the physical file contains the contents of the second file. This becomes apparent if myfile and myFILE have different contents in the repository. If the commit contains, for example, myfile and myFILE, git will create myfile, and then when it goes to create/update myFILE, the filesystem gives it a handle to myfile. ![]() If a git commit contains two files whose names differ only in case, checking out that commit to a working directory in a case-insensitive filesystem causes problems. I will address that issue with this answer. I agree with Richard that this could stem from a case sensitivity/insensitivity problem. How do I remove these files from git status? I have also tried to uninstall and reinstall GIT and am currently running 1.7.5.4 install and complied with the help of brew (Ruby package manger). The only thing that seems to remove the files is if I log on as another use on my Mac, which makes me think its a problem my local machine and not the repo itself. #Cloning into vendor/plugins/project_engine. I have also tried to delete the entire project whom the submodule belongs to, pulled that and then initiated and updated the submodule but to no avail. I have tried to git clean -fĪnd also removed the entire submodule and checked out from the master server. I am again greeted with the long list of files. # modified: public/javascripts/app/fckeditor/fckpackager.xml # modified: public/javascripts/app/fckeditor/fckeditor.js # modified: public/javascripts/app/fckeditor/fckconfig.js # modified: public/javascripts/app/fckeditor/editor/skins/silver/fck_editor.css # modified: public/javascripts/app/fckeditor/editor/skins/silver/fck_dialog.css # modified: public/javascripts/app/fckeditor/editor/skins/office2003/fck_editor.css # modified: public/javascripts/app/fckeditor/editor/skins/office2003/fck_dialog.css " to discard changes in working directory) This way, you can switch back to the original branch without losing your work.I am working in a submodule and am having trouble untracking a folder full of files $ git status
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |