jbckid/Skoolr — comment on commit 800289101f72170e9e1074acdd0871e613c1170b
File:  line 0
By LGrocket:

I have finally conquered Git! This is finally the correct code with the database migrated in one commit to the master branch. It bothers me that I didn't get rid of the .DS_Stores but that's a minor problem. I have also figured out how we can clean up the commit history of this remote master, but I don't want to squash commits unless everyone is synced. We can do it when we're all in meatspace together on Monday, I'll squash:
2nd commit
horrible commit
horrible commit 2

Fyi, to make sure that .DS_Stores are not tracked to commit in your feature branches run:
find . -name ".DS_Store" -type f -delete
git status -s

You should see "D" next to all your .DS_Store files. If you see "??" that means the file is untracked, which is a fine solution as well.