Git bash won't let me pull

So I made some changes to my file and now when I check my status it says :

   On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 80 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
nothing to commit, working directory clean

So I try to pull and it says

  • How do I run a command on all files from git ls-files?
  • In a bash script, git does not recognize it own directory?
  • Git - Use port 9418 for remote on github
  • Git commit hook - How to use the commit-msg hook to check for string in message?
  • setgid bit not preserved by git on new directory in `.git` folder?
  • Is running git update-index --refresh from PS1 prompt safe?
  • error: unable to create file docs/com/teamname/tutortrader/C:\nppdf32Log\debuglog.txt (Invalid argument)
    

    I’ve tried to git rm -f docs/com/teamname/tutortrader/C:\nppdf32Log\debuglog.txt but it just says that this file doesn’t exist. I’ve also tried rm -f C:\nppdf32Log\debuglog.txt, but that doesn’t exist either.

  • Git - Can you do something with rebase that you can't do with merge?
  • Is it possible to store only a checksum of a large file in git?
  • Rspec stops working suddenly because of `require': no such file to load
  • GIT - changing code in an earlier commit so that it's reflected in the commits after
  • How do you rename a Git tag?
  • Why did the GitHub windows client delete all of my work?
  • 2 Solutions collect form web for “Git bash won't let me pull”

    In the github interface with a file open, look at the top-right-hand side. You’ll see buttons labeled “Raw”, “Blame” and “History”. To their right — if you have write access to the repo — there will also be a garbage can. Clicking on that will commit a change deleting that file from the repository.

    Do so for the offending file, and you’ll again be able to check this out on Windows.

    Some kind person (presumably on Linux or Mac) has added a file to your repo called C:\nppdf32Log\debuglog.txt. This is an invalid filename on Windows. You need to get them to rename this file or you won’t be able to clone this repo on Windows any more.

    c.f. how do I clone files with colons in the filename

    Git Baby is a git and github fan, let's start git clone.