Goal Mark generated (concatenated and minified) JavaScript files and CSS files as binary files within Git to allow checking them in while avoiding merge conflicts (currently, I don’t check these files in). Failure I have been unable to get this to work so I thought I’d document my issue here and update this page when […]
Git
Git Submodule fatal: Could not read from remote repository
Why to Setup Your Git Submodules as https:// not ssh I was pulling a public GitHub repo the other day which featured submodules. The frustrating problem is whenever I tried to init the submodules with the line git submodule update –init –recursive I got the error Git Submodule fatal: Could not read from remote repository […]
Undo Git Commit
That is Not What I Meant to Commit It seems no matter how many times I do git status, I still managed to sneak in a completely wrong commit sometimes. Additionally, I never remember how to undo a commit so I end up googling “undo git commit” and I get way more information than I […]
Git Conflict Compiled Sass Files
I’ve been using both Git and Sass for some time now. These two tools have had a huge positive impact on my development. The issue that arises when combining Git and Sass is when checking in compiled CSS, it is common to get conflicts with other contributors on the Git repository. Don’t Check in Your […]