So, if I make changes to a .scss file and compile it into a .css file and then push the entire project to a remote repo, there are 2 files that have been altered, right?
I've noticed, however, that only the .css file appears with merge conflict notices. Would anyone know why this is? Could it be the way my company set up git? To automatically accept that my version of the .scss files will always override the remote repo's version? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
