This EOL problem has had disrupting consequences on some repositories. Forgetting to use
git status via Git CLI before some SM operations introduced conflicts that prevent merging branches.
I can't understand what's going on here, but the EOL
CR false positive seems to show up only the in SM changed files, but nevertheless it prevents merge operations because it then sees differences between the commited files and those in the working area.
And, somehow, some commited text files seem to prevent merging branches although there should be no conflicts reported.
I'm really struggling to understand the exact nature of this problem, but mishandling of EOL normalization is a serious problem under Windows — add to that the known problems that MS Windows introduces in working with Git when switching branches (files that can't deleted or changed due to handles), then this whole thing becomes a nightmare.
Basically, in those (production) repositories where this problem creeped in, I'm discovering that I can't now merge local dev branches back into master — neither via Git CLI nor SM. During merge attempts, the EOL false positives alway creep back in making Git see the files in the working area as changed (although they are not), and merging aborts...
Are there been any progress on this issue? I really hope it will be fixed ASAP.