Why does git say “Pull is not possible because you have unmerged files”?

When I try to pull in my project directory in the terminal, I see the following error: harsukh@harsukh-desktop:~/Sites/branch1$ git pull origin master U app/config/app.php U app/config/database.php U app/routes.php Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use ‘git add/rm <file>’ as appropriate to mark … Read more