Sign in Register
Copied to clipboard

Flag this post as spam?

This post will be reported to the moderators as potential spam to be looked at


  • Simon Dingley 1431 posts 3332 karma points c-trib
    May 01, 2018 @ 13:33
    Simon Dingley
    0

    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=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?

    Thanks, Simon

    Copy Link
  • Dave Woestenborghs 3325 posts 11170 karma points MVP 5x admin c-trib
    May 01, 2018 @ 13:36
    Dave Woestenborghs
    0

    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

    Copy Link
  • Dave Woestenborghs 3325 posts 11170 karma points MVP 5x admin c-trib
    May 01, 2018 @ 13:38
    Dave Woestenborghs
    101

    I just checked my chat with Sebastiaan about this. I also updated my local git version.

    Dave

    Copy Link
  • Simon Dingley 1431 posts 3332 karma points c-trib
    May 01, 2018 @ 14:04
    Simon Dingley
    1

    Thanks Dave, Git version update and reset of the branch worked #h5yr

    Copy Link
  • Simon Dingley 1431 posts 3332 karma points c-trib
    May 01, 2018 @ 13:39
    Simon Dingley
    0

    Thanks Dave, will try that as its driving me nuts.

    Copy Link
  • Dave Woestenborghs 3325 posts 11170 karma points MVP 5x admin c-trib
    May 01, 2018 @ 13:40
    Dave Woestenborghs
    0

    Haha...i know the feeling

    Copy Link

  • This forum is in read-only mode while we transition to the new forum.

    You can continue this topic on the new forum by tapping the "Continue discussion" link below.

Please Sign in or register to post replies