If you've commited some changes in git to the wrong branch, but haven't pushed, use the git reset --soft command to move your changes to the correct branch.
How to discard local changes in a git repository and sync local branch with HEAD (overwriting all local changes).
Github error when running `git pull origin master`: 'fatal: Couldn't find remote ref master'
Inspect a file's history, hash, commit info, diffs, etc. for a specific file in git