The Windows machine wanted to sync and change the line endings from LF to CRLF. I updated the global settings on each computer and restarted for good measure to see what might happen next. Then I worked on following the directions provided by the GitHub folks here.
I generally try to avoid the command line, as I can easily screw something up, but I have learned how to fix things this way when the desktop app just will not do. gitignore Windows and Mac helper files, but not line endings? I live and breathe csv files!įirst, make sure you have Git installed, so you can work on the command/terminal to update the required settings. How have I literally never had this problem until now? We’ve dealt with. My direct research group is 80% Mac people, but we have more than a handful of Windows folks.
However! I am flabbergasted we’ve never had this issue before. Helpfully, GH desktop does warn you of this, but I was totally ignoring the little triangle icon that said “hey line endings are doing a thing here”. I am well aware that Mac and Windows don’t always use the same line endings - this was something that I thought was mostly fixed in OSX but alas, every time I would go to use perl (I love perl, don’t me), I would remember that Mac text files != to Windows text files.
csv files and a few other odds and ends (.R. So, I’ve been making One Drive exceedingly unhappy moving GBs of file from one to another.Īs I was working on reconnecting my GitHub repositories to the files, I was trying to understand why several of my repos were saying I had a bunch of file changes but nothing in the files themselves had changed. I have happily acquired a new Mac Book (yay!) and a new work computer (Windows).