I've looked git straight in the eye and it kicked my a-- and sent me home, crying.

[Uri Goldstein]

So if you're up for it -

Would you like to check out this question I posted on StackOverflow concerning Git and a mysterious line endings issue I've encountered:

http://stackoverflow.com/questions/31618731/git-unable-to-discard-changes-due-to-line-endings/31635216#31635216

Tx! :)

[Nieve]

A bit difficult to follow what happened with the different update, but if the .gitattribute file was the criminal, I posted an answer that might be what you're after.

[Uri Goldstein]

Thanks:)

I voted up but will keep the question open for a while longer in wait for a fully detailed explanation of how git is behaving here.