I have pull some changes in my branch and conflict arises in files that was not modified.
I have pull all changes from my core branch
git pull origin core
Then created a new branch from core new-branch
done some changes in new-branch and merge my core branch into new-branch for save side if there is any conflict then I 'll into new-branch
git merge core
Then I switched back to core branch
git checkout core
Again pull changes from core
git pull origin core
Then I tried to switch back to new-branch but git shows error that your local changes might be overridden you need to commit those changes, but I have't done any local change. Anyhow when I see the git status it shows all the modified files that was pulled, when I again execute the git pull origin develop command it shows some conflicts but I have done any change in those files.
Any idea why git show some conflicts if we have pull twice?