css conflict error EVERYTIME? is there a way to turn this off?

everytime I update or my teammate updates we get css conflict errors. is there a way to turn this off, seeing as sass will compile a new css soon after anyway?  
1 answers

Hello Jason, 

I belive you can use Git ignore for the files (Not 100% sure it will work but I've seen .gitignore files scattered in my project which I assume were generated by Mendix). 

See https://git-scm.com/docs/gitignore for documentation.

My projects seem to contain a gitignore file in \deployment\web\styles\sass\lib which you can also use as a template.

Hope this helps