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 .

  • Can you explain what “git reset” does in plain english?
  • Why does git clean -dX not remove my ignored directory?
  • In GIT, how can I prevent people from changing or removing commits that have already been pushed?
  • Why explicitly call git reset --soft before git reset (--mixed)
  • Importing old git projects to Gerrit
  • HEAD and ORIG_HEAD in Git
  • 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 ?

  • Web Development Work flow using git
  • How to set up a git repo that works on Windows and Linux in Android Studio (and using gradle)
  • Why does git rebase often have fewer merge conflicts than a merge?
  • How to deploy a website via git pull?
  • git -add doesn't work with wildcards
  • what determines default branch when cloning from git bare repository
  • 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.