Why does git say “Pull is not possible because you have unmerged files”?
What is currently happening is, that you have a certain set of files, which you have tried merging earlier, but they threw up merge conflicts. Ideally, if one gets a merge conflict, he should resolve them manually, and commit the changes using git add file.name && git commit -m “removed merge conflicts”. Now, another user has … Read more