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

  • Use of apostrophe (single-quote) in a git commit message via command line?
  • git: check when the last fetch was run
  • Translate parse_git_branch function to zsh from bash (for prompt)
  • How to stop git hanging on commit in cygwin bash
  • Failure / Unstable via Script Return Code
  • Bash alias of an svn command piped to awk
  • 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.

  • How can I keep a subfolder of a git repo in sync with a subfolder of another git repo
  • How to change a git submodule to point to a subfolder?
  • Want to download a Git repository, what do I need (windows machine)?
  • How to close a branch WITHOUT removing it from history in git?
  • Is it possible to link directories in git?
  • git grep by file extensions
  • 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.