HOW TO SOLVE? Your local changes to the following files would be overwritten by merge

You should do a git commit right after the git add --all
git add .
git commit -m "Your message here"
git pull

For more detail, I suggest this site:

its not yet merged,
if you dont want these changes, kindly stash those files using ‘git stash’ command and then request to pull