Re: [git-users] Newb question: can some one explain to me why, when pushing Sass files, only the compiled .css file gets flagged as a merge error and not the .scss files?

2017-01-26 Thread AD S
Yeah, checkout SASS and/or LESS. You can now make variables with css and make layered and nested classes. A compiler will then 'hard code' the variables, lint the code and remove comments, spaces and line breaks to minify the file. On Thursday, January 26, 2017 at 2:56:05 AM UTC+10, Michael

Re: [git-users] Newb question: can some one explain to me why, when pushing Sass files, only the compiled .css file gets flagged as a merge error and not the .scss files?

2017-01-25 Thread Michael
So those crazy cascading style sheets that are a to edit with Stylish are actually compiled from something else that is human read/edit-able? That makes a lot of sense, actually. I thought they were just spat out by some program that did layout. On 2017-01-25, at 3:59 AM, Nelson Efrain

Re: [git-users] Newb question: can some one explain to me why, when pushing Sass files, only the compiled .css file gets flagged as a merge error and not the .scss files?

2017-01-25 Thread Nelson Efrain A. Cruz
I think that "the problem" is the compiled css file. Let's see, probably more than one scss file are compiled to one single css file, say a.scss and b.scss are compiled to c.css. If you change only a.scss in one commit and then try to pull another commit with b.scss changed you will have no

Re: [git-users] Newb question: can some one explain to me why, when pushing Sass files, only the compiled .css file gets flagged as a merge error and not the .scss files?

2017-01-24 Thread AD S
Ah, so presumably in setting up my development box, some one told git not to track .scss files. Cheers On Wednesday, January 25, 2017 at 11:42:27 AM UTC+10, charlesmanning wrote: > > Git has no magic knowledge of scss files or css files. It will track > whatever you tell it to track. > > So

Re: [git-users] Newb question: can some one explain to me why, when pushing Sass files, only the compiled .css file gets flagged as a merge error and not the .scss files?

2017-01-24 Thread Charles Manning
Git has no magic knowledge of scss files or css files. It will track whatever you tell it to track. So for example let's use something more people are familiar with - something like C. If you tell git to track foo.c it will track foo.c. If you tell it to track foo.o it will track foo.o. If

[git-users] Newb question: can some one explain to me why, when pushing Sass files, only the compiled .css file gets flagged as a merge error and not the .scss files?

2017-01-24 Thread AD S
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