Syncing between Linux and Windows can run into trouble with line endings

[tillberg]

If you sync a git repo between a linux machine and a windows machine, gut and git can have competing agendas in regard to line endings. If autocrlf is off for a git repo but on for the gut repo, for example, then gut would create a different version of the file when syncing remote changes (e.g. maybe you did git pull on a synced linux machine) as opposed to performing the git operation locally (e.g. git pull on the windows machine).

I'm not really sure what a frustration-free solution looks like, or if there is one. On the bright side, when I didn't muck with the autocrlf settings of either git or gut, I only saw this once and haven't been able to reproduce yet. But on the not-so-bright side, git/gut handle unchanged-except-for-line-endings files very poorly; I got into a situation where I had "modified" files but git reset --hard and git stash, etc, did nothing, and those working directory changes were just stuck there (note: they also had stuck file mode changes, from 0755 to 0644, as I was diagnosing #3 at the time).