git line endings - can't stash, reset and now can't rebase over spurious line endings commit

后端 未结 6 1373
[愿得一人]
[愿得一人] 2020-12-13 13:21

I have a repo I added a gitattributes to it and was working on it fine. I sync it via dropbox to another machine. When I opened it to the other machine a bunch

6条回答
  •  别那么骄傲
    2020-12-13 14:03

    None of this works on my Windows 10 WSL, I had diff in README.md and was not able to pull changes, so I've did this from

    echo README.md >> .gitignore # not sure if this is needed
    rm README.md # this need to be rm without git
    git pull
    git checkout .gitignore # to remove the change
    

    I think that it will also work if you just do:

    rm file
    git checkout 
    

    but I'm not able to test because my repo is working now.

提交回复
热议问题