Closed meh-uk closed 9 years ago
P.S.: In most cases, you can avoid merge commits by running pull like this:
git pull --rebase
It will integrate the new commits into your timeline (so to speak, I'm not a git guru:-), and only trigger a merge commit if there are actually conflicts
Merged & published. Being able to just type grunt
without the tedious --force
is really awesome. Well done!
I did spaces but i vote for tabs. :) But you're 2 against 1. :( :) Let's go 4 spaces.
New attempt to remove the JavaScript warnings.