This is happening because you are in the middle of a merge. Either complete the merge by resolving all conflicts and adding the appropriate files to the index, or abort the merge with git merge --abort. Note that if you do abort the merge, you will most likely get conflicts when you do your git pull, as I assume your previous pull caused conflicts (which is why you were left in the middle of a merge).