force files to be overwritten by merge code example
Example 1: force files to be overwritten by merge
$ git stash --include-untracked
Example 2: force files to be overwritten by merge
$ git reset --hard
$ git stash --include-untracked
$ git reset --hard