do not push history of git, just last commit code example
Example 1: how to get stashed on git
git stash pop or
git stash apply
Example 2: i get your branch is ahead of master after I pulled from remote master
git fetch origin
git stash pop or
git stash apply
git fetch origin