On branch stash_testing: save local changes with 'git stash' and revert the local directory to the HEAD commit of the current branch.  'git stash branch <branchname>' creates a new branch with the changes from the latest stash (if you haven't specified a name).
Merge branch 'stash_testing'