When updating from master I get a message added by us: sass/styles.scss
However, this file already exists on master. Shouldn't this just be a merge conflict? -- 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.
