We have about 4 files that don’t like to be merged. Every time we have a PR that includes one or more of these files it detects the entire file as being changed.
I’ve spent a good amount of time trying to normalize these files but no matter what I do it seems to always detect the whole file as changed. We’ve inspected the files and found a couple of lines where the line endings didn’t match up, fixed it, and the file still showed as everything changing.
My suspicion is that our 1 Mac developer cursed the files somehow 🤔
Has anyone ran into this before? I’m dying to fix this!
Maybe relevant? Our Git Enterprise version is pretty outdated at 2.10.8. The project in question is an ASP. NET application.
submitted by /u/cipp
[link] [comments]