Doing a git stash doesn't remove changes in git local [duplicate]

Question

When I do git status, I see some files having local changes (seems to be indentation changes).

And when I do git stash, it doesn't remove those files from the queue. It blocks my auto pull script from fetching from remote git.

$ git stash
Saved working directory and index state WIP on develop: 05c60a5 Merge remote-tracking branch 'origin/develop' into develop
HEAD is now at 05c60a5 Merge remote-tracking branch 'origin/develop' into develop

$ git stash
On branch develop 
Your branch and 'origin/develop' have diverged and have 23 and 127 different commit(s) each, respectively.

Changed but not updated:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory) 

    modified:   config/buznames/businessname_map.
    modified:   public/css/_lib/dropdown.less
    modified:   public/css/_lib/secureBadge.less

Answer 1

git stash will remove any uncommitted changes but not your local (unpushed) commits.

I believe your local branch has diverged and you're having merge conflicts when you're trying to pull. You will have to resolve these conflicts before being able to continue with the pull request.

If you're trying to remove all local commits in your develop branch with respect to the remote branch you can do something like:

$ git checkout develop
$ git fetch origin develop
# Reset develop branch back to origin/develop
$ git reset --hard origin/develop

NOTE: THIS WILL DELETE/DISCARD ALL YOUR LOCAL COMMITS. YOU WILL NOT BE ABLE TO RESTORE THEM