unable to git pull successfully

[1a2a3a]

@sdetweil did as per your mentioned but still stuck with .vscode/setting.json

[KristjanESPERANTO]

@1a2a3a If you want to reset the module without saving your local changes, you can do this in the module’s directory:

git fetch origin master
git reset --hard origin/master
git pull

[1a2a3a]

@KristjanESPERANTO thanks, that fixed it now!

[sdetweil]

@KristjanESPERANTO but why does this fix the problem of untracked files blocking pull? if they are untracked, they are not in the repo… I have never seen this happen

[KristjanESPERANTO]

@sdetweil With git reset ... everything is reset hard, this fixes the problem, but does not help to explain it. I haven’t fully understood myself why git pull didn’t worked after git stash.