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
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?
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