How to get past the “Can't pull because it has unmerged file” error message?

I tried to do:

git pull origin master 

It downloaded the files from another repository, now I realized the origin was named as origin1 for my actual repository .

  • calling git diff in pre-commit shell script
  • git merge: Removing files I want to keep!
  • Right strategy when using git for multiple extension development
  • git and local modifications
  • Trying to set up local environment to run app cloned from Heroku
  • Why does git keep deleting my folder?
  • git pull origin1 master

    But now I am getting

    can't pull because it has unmerged file.

    Is there a way I can fix this ?

  • Intellij with Git - Contents have differences only in line separators
  • Why git pull offers a chance to merge but git push doesn't?
  • When Installing gitolite I get “/tmp/ does not seem to be a valid ssh pubkey file”
  • Python 3 Wont run from the Git Bash command line
  • How to generate git superproject from existing directory structure
  • git: rename file and change the content of the file
  • One Solution collect form web for “How to get past the “Can't pull because it has unmerged file” error message?”

    If you don’t have any work in progress, you can do:

    git fetch origin1
    git reset --hard origin1/master

    Warning: that will remove any untracked file.

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