I have two working branches, master and forum and I\'ve just made some modifications in forum branch, that I\'d like to ch
git reset HEAD^
the --hard is what's killing your changes.