Git pulls not updating the local repo

Question

When we pull the changes from remote repo the changes are not updating in the local repo. Instead it shows as changes to commit in the local repository. I am not pretty sure whether I have explained my issue properly.

Does anyone knows why the local repo is not updating when a pull is done and why it is showing as changes to commit to the local repo.

Thanks,

Answer 1

You have a merge conflict. You need to resolve the conflict and commit the merge to proceed.