Today I ran into an issue with git and case sensitivity on Macs. Although Macs preserve case, their filesystems is case insensitive.
I did not realize the power of
git reset. If you need to do a
git reset on your working copy and you have modified (tracked, but uncommitted) changes, then
git reset will blow away all your changes without warning.
Recently I’ve been working on a Drupal project at work and a fellow co-worker wanted to piggy-back resources on a similar project. He sent me over the code for a custom module I was going to use on the project.
Only after committing and pushing the folder from my local git repo to the origin server did I notice the remnants of my co-workers .git folder. This cause git to treat the subfolder as a git submodule and ignore the contents of the subfolder as I push my project to the origin server.
Here is what you need to do in order to remove the submodule and add as a subfolder:
git rm --cached subfolder git add subfolder git commit -m "Enter message here" git push
Now the origin should be able to see the contents of the subfolder.