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

DevOps

When I try to pull in my project directory in the terminal, I see the following error:

bhamra@bhamra-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 resolution, or use 'git commit -a'.

 

Why does git say "Pull is not possible because you have unmerged files", and how can I resolve it?
 

1
Answers

Aug 4th, 2020 By: Tabres

Replies

Some of the files in your code directory have not been merged in the right way in your last commit. Hence, you are getting the U(unmerged) flag for those files when you tried to pull them. To resolve this error, you have to resolve the merge conflict and commit the changes first. Then you will be able to successfully pull the repo.



You have to manually add each of the files that you are getting the error for and then commit the changes in the following way.



git add file-name && git commit -m "resolved merge conflicts"

7 months ago - By vivek reddy
 
 

If you want to unleash your potential in this competitive field, please visit the DevOps course page for more information, where you can find the DevOps tutorials and DevOps frequently asked interview questions and answers as well.

 

This topic has been locked/unapproved. No replies allowed

Login to participate in this discussion.

Leave a reply

Before proceeding, please check your email for a verification link. If you did not receive the email, click here to request another.

Categories