Why do modified files have a modified status after git pull?

Question

git

On the remote we have a develop branch
And on the local I have a branch with a feature

Since the changes that I need on the branch with my feature have occurred on develop, I decided to pull them to myself:

git checkout "branch with a feature"
git pull origin develop

After that, all the changes pulled up, I fixed 2 conflicts and everything seems to be fine.
But when I wrote git status, I saw that all the files that were pulled up from the development, for some reason, had the modified status...

Although the file changes should have just been pulled up, and not displayed in this way in the git status



. Can I somehow fix it?

Answer 1

And after resolving the conflicts, did you complete the failed pull? The changes were then pulled into the working directory, but it would be necessary to fix the merge commit itself.
Something like:
git merge --continue