oh, wait, switching branches didn't vaporize my changes, it auto-committed them. which is still weird and possibly a bug? Nick Hunt nhunt11@xxxxxxxxx 404-988-1845 On Mon, Mar 19, 2018 at 3:13 PM, Nick Hunt <nhunt11@xxxxxxxxx> wrote: > i committed my changes, then ran > git reset --soft HEAD^ > at this point everything is fine > then i switched branches, and all of my changes vaporized into thin > air. uhhh, is this supposed to happen? > > anyway, thank god intellij saves my work for me as i go, so i didn't > have to re-write all my code. > > my bash/zsh commands are attached. > > thanks for the help! :)