wtf

gistfile1.txt

drostie:honeybadger (master) $ gcm "add the rest of the compiled templates and do some cleanup"
[master f7f68da] add the rest of the compiled templates and do some cleanup
 19 files changed, 1103 insertions(+), 34 deletions(-)
 create mode 100644 compiled_templates/chooseSource.handlebars.js
 create mode 100644 compiled_templates/endOfStream.handlebars.js
 create mode 100644 compiled_templates/home.handlebars.js
 create mode 100644 compiled_templates/isAndLikes.handlebars.js
 create mode 100644 compiled_templates/messageStream.handlebars.js
 create mode 100644 compiled_templates/miniProfile.handlebars.js
 create mode 100644 compiled_templates/navbar.handlebars.js
 create mode 100644 compiled_templates/picWithTags.handlebars.js
 create mode 100644 compiled_templates/pickAPic.handlebars.js
 create mode 100644 compiled_templates/picture.handlebars.js
 create mode 100644 compiled_templates/pictureChooser.handlebars.js
 create mode 100644 compiled_templates/settings.handlebars.js
 create mode 100644 compiled_templates/untaggedPicture.handlebars.js
 create mode 100644 compiled_templates/untaggedPictureSuggestions.handlebars.js
 create mode 100644 compiled_templates/user.handlebars.js
 create mode 100644 compiled_templates/userMessages.handlebars.js
drostie:honeybadger (master) $ gs
# On branch master
# Your branch is ahead of 'origin/master' by 3 commits.
#
nothing to commit (working directory clean)
drostie:honeybadger (master) $ gs
# On branch master
# Your branch is ahead of 'origin/master' by 3 commits.
#
nothing to commit (working directory clean)
drostie:honeybadger (master) $ git push
To git@github.com:okcwest/honeybadger.git
 ! [rejected]        HEAD -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:okcwest/honeybadger.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.
drostie:honeybadger (master) $ git pull
remote: Counting objects: 27, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 18 (delta 14), reused 18 (delta 14)
Unpacking objects: 100% (18/18), done.
From github.com:okcwest/honeybadger
   271f54f..546fa13  master     -> origin/master
First, rewinding head to replay your work on top of it...
Applying: [wip] move toolbar into compiled templates directory
Applying: [broken wip] move a bunch more stuff into template files
Applying: add the rest of the compiled templates and do some cleanup
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
error: Your local changes to the following files would be overwritten by merge:
  compiled_js/app.js
Please, commit your changes or stash them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0003 add the rest of the compiled templates and do some cleanup

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".

drostie:honeybadger ((no branch)) $ gs
# Not currently on any branch.
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified:   compiled_js/app.js
# modified:   compiled_js/picture_chooser.js
#
no changes added to commit (use "git add" and/or "git commit -a")
drostie:honeybadger ((no branch)) $ ga .
drostie:honeybadger ((no branch)) $ gs
# Not currently on any branch.
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
# modified:   compiled_js/app.js
# modified:   compiled_js/picture_chooser.js
#
drostie:honeybadger ((no branch)) $ git rebase --continue
Applying: add the rest of the compiled templates and do some cleanup
drostie:honeybadger (master) $ gs
# On branch master
# Your branch is ahead of 'origin/master' by 3 commits.
#
nothing to commit (working directory clean)
drostie:honeybadger (master) $ git push
Counting objects: 51, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (40/40), done.
Writing objects: 100% (42/42), 7.17 KiB, done.
Total 42 (delta 18), reused 0 (delta 0)
To git@github.com:okcwest/honeybadger.git
   546fa13..07eb28c  HEAD -> master
drostie:honeybadger (master) $ gs
# On branch master
nothing to commit (working directory clean)
drostie:honeybadger (master) $ ls com
compiled_js/        compiled_templates/ 
drostie:honeybadger (master) $ ls compiled_templates/
toolbar.handlebars.js
(reverse-i-search)`op': gcam "[delivers #32318539] add more scope to 'picture' template"
drostie:honeybadger (master) $ git stash pop