search

ga-wdi-boston / browser-template-ARCHIVED

CLICK HERE BEFORE YOU USE THIS TEMPLATE: http://i.imgur.com/UmjLrOc.gif
Other
19 stars 132 forks source link

Grunt Deploy adding node modules causing conflict with master #102

Closed deeforte closed 7 years ago

deeforte commented 7 years ago

Opening issue with browser template to be investigated. I have a workaround but we want to make sure the issue is documented. While running the grunt deploy during script line 16 - command: 'test -z "$(git status --porcelain)" || (git status && false)' is adding node modules to gh-pages branch. When we get to the last command - git checkout master - grunt deploy aborts because of conflict with master branch. Danny helped with a workaround to rm -rf node_modules/ and then I'm able to checkout to master and the deploy finishes.

Jcornmanhomonoff commented 7 years ago

@gaand says the most likely reason for this is that node_modules were added to the git repository.