We launched new forums in March 2019—join us there. In a hurry for help with your website? Get Help Now!
    • 37042
    • 384 Posts
    I forked the current 2.3 Development repo, created a local copy and changed the SCSS file at
    _build/templates/default/sass/index.scss


    When I commited this back to my GitHub repo, my CSS change shows up with it's red deletion and green addition
    https://github.com/eladnova/revolution/commit/5b36b0cab8dee1ae3ad865e2326dd8b39e3798b0

    I'm using CodeKit 2 to process that CSS file to
    manager/templates/default/css/index.css
    and I thought a similar thing would happen. IE, the CSS would have 1 deletion and 1 addition. Instead, this file has 8,920 additions and 18 deletions so clearly something went wrong.

    Would this be a setting with my CodeKit 2 processor or something I did incorrectly with Git and GitHub? Maybe some formatting options etc?


      ...
      • 40045
      • 534 Posts
      I just do not checkout the compiled css file (had many fights with it creating merge conflicts that I couldn't solve afterwards bc the mergetool im using [p4merge] crashed due to the huge 1 line minified css...), you can remove the minified/compiled css file before committing with

      git checkout -- manager/templates/default/css/index.css


      the correct path you get with "git status"
        • 3749
        • 24,544 Posts
        What you saw is almost always caused by variations in the EOL character on different platforms.

        I spent a lot of time looking at this a while back, and concluded that there's no good universal solution for it other than training all contributors to use the same scheme in their local Git repos *and* their editors -- one that coerces everything to *nix line endings.
          Did I help you? Buy me a beer
          Get my Book: MODX:The Official Guide
          MODX info for everyone: http://bobsguides.com/modx.html
          My MODX Extras
          Bob's Guides is now hosted at A2 MODX Hosting