We all have been there… For the beginner it’s easy to mess things up. What are your horror stories with Git?

Link to xkcd

  • whats_all_this_then@programming.devEnglish
    3·
    1 year ago

    I’ve had a similar issue before and the problem was that I had made the repo on linux, worked on it a bunch, copied it over to a different PC running windows, then copied it back. Found this on stackoverflow and it fixed it for me, but I’ve only tested it on linux (probably won’t work on windows because grep). Hopefully it helps:

    git diff -p -R --no-ext-diff --no-color | grep -E \"^(diff|(old|new) mode)\" --color=never | git apply

    • JackbyDev@programming.devEnglish
      2·
      1 year ago

      That’s the weird thing, everyone here uses Mac and the server running the template is Linux so this isn’t a case of a Windows user forgetting to set autocrlf and even then it is in the git attributes file.