gistfile1.txt

[made my commit....]

$ git push origin bv-deploy
Everything up-to-date
$ git branch
  bv-deploy
  deploy
* master
[oh shit I'm on the wrong branch...]
$ git checkout bv-deploy
Switched to branch 'bv-deploy'
[oh shit^2 all my changes are gone]
$ git branch
* bv-deploy
  deploy
  master
$ git push origin bv-deploy
Everything up-to-date
$ git status
On branch bv-deploy
nothing to commit, working directory clean
$ git checkout master
Switched to branch 'master'
$ git merge bv-deploy
Already up-to-date.
$ git merge --strategy=ours bv-deploy
Already up-to-date.
$ git branch
  bv-deploy
  deploy
* master
$