I'm having a right mare at the moment trying to sort a new pull request because my local copy of the solution is continually showing modifications to files I've not touched. From what I can gather its likely something to do with the .gitattributes file in the repository (specifically the text=auto values), however, I cannot overcome the problem to be able to merge upstream changes even if I remove the file itself.
I've also tried resetting the branch and the files remain "modified" but with no changes. I can't merge or check out any other branch at the moment and its become really frustrating. Any ideas?
Git & Line Endings for UmbracoCms Solution
I'm having a right mare at the moment trying to sort a new pull request because my local copy of the solution is continually showing modifications to files I've not touched. From what I can gather its likely something to do with the .gitattributes file in the repository (specifically the
text=autovalues), however, I cannot overcome the problem to be able to merge upstream changes even if I remove the file itself.I've also tried resetting the branch and the files remain "modified" but with no changes. I can't merge or check out any other branch at the moment and its become really frustrating. Any ideas?
Thanks, Simon
Hi Simon,
I had the same problem.
What I did was remove my local repo. And cloned it again.
Spent hours on trying to solve this. But this was the only thing that worked for me.
Dave
I just checked my chat with Sebastiaan about this. I also updated my local git version.
Dave
Thanks Dave, Git version update and reset of the branch worked #h5yr
Thanks Dave, will try that as its driving me nuts.
Haha...i know the feeling
is working on a reply...