sass - Can I ignore .css files while running >$ git mergetool? -
our project has .scss file generate .css , generated .css files stored in repo.
there's no point merging our entire site's .min.css or .css.map.
when running $ git mergetool
, can configure ignore these files, whether directory or file name or file extension?
you can add
.min.css .css.map
to .gitignore file. after commiting .gitignore file these entries can ignore files have been pushed executing following command
git rm -r --cached git add .
what above commands refresh index file contains published .min.css, .css.map files (filtered -- sortof) , commit again after above 2 commands delete files generated.
using git attributes, possible ignore remote changes during merge. more details provided in link below -
http://git-scm.com/book/en/v2/customizing-git-git-attributes#merge-strategies
Comments
Post a Comment