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 A. Cruz <nea...@gmail.com> wrote: > 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 conflicts in scss files, but c.css file will be changed in both > commits (wich can lead to a merge conflict depending on the situation). > > El mié., 25 de ene. de 2017 a la(s) 01:42, AD S <a...@radianweb.com.au> > escribió: > 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 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 you tell it to track both it will track both. > > Same with your scss and css files. > > Generally you don't want to track derived files (ie. stuff that is an output > from compiling) - though there are exceptions to this. > > If you no longer want to track the css file than remove it from git with git > rm > > You might also want to add it to your .gitignore file too. > > > > On Wed, Jan 25, 2017 at 2:19 PM, AD S <ad...@radianweb.com.au> wrote: > 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+...@googlegroups.com. > > For more options, visit https://groups.google.com/d/optout. > > -- > 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. > > -- > 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. --- Entertaining minecraft videos http://YouTube.com/keybounce -- 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.
