hold yer hat

i'm fucking up

cls(cl-781)$ git add -A
cls(cl-781)$ git commit -m "fingers crossed the documentaiton is correctly deleted"
[cl-781 28104bb] fingers crossed the documentaiton is correctly deleted
 1 file changed, 30 deletions(-)
cls(cl-781)$ git checkout sprint015
Switched to branch 'sprint015'
Your branch is up-to-date with 'origin/sprint015'.
cls(sprint015)$ git pull origin sprint015
remote: Counting objects: 18, done.
remote: Compressing objects: 100% (17/17), done.
remote: Total 18 (delta 7), reused 0 (delta 0)
Unpacking objects: 100% (18/18), done.
From https://github.com/hgslabs/cls3
 * branch            sprint015  -> FETCH_HEAD
   b10f614..9dc0a06  sprint015  -> origin/sprint015
Updating b10f614..9dc0a06
Fast-forward
 app/views/layouts/_header.html.haml     | 3 ++-
 app/views/layouts/application.html.haml | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
cls(sprint015)$ git checkout cl-781
Switched to branch 'cl-781'
cls(cl-781)$ git rebase -i sprint015
Successfully rebased and updated refs/heads/cl-781.
cls(cl-781)$ git push origin cl-781
To https://github.com/hgslabs/cls3.git
 ! [rejected]        cl-781 -> cl-781 (non-fast-forward)
error: failed to push some refs to 'https://github.com/hgslabs/cls3.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
cls(cl-781)$ git status
On branch cl-781
nothing to commit, working directory clean
cls(cl-781)$ git checkout sprint015 
Switched to branch 'sprint015'
Your branch is up-to-date with 'origin/sprint015'.
cls(sprint015)$ git pull origin sprint015
From https://github.com/hgslabs/cls3
 * branch            sprint015  -> FETCH_HEAD
Already up-to-date.
cls(sprint015)$ git checkout cl-781
Switched to branch 'cl-781'
cls(cl-781)$ git rebase -i sprint015
Successfully rebased and updated refs/heads/cl-781.
cls(cl-781)$ git push origin cl-781
To https://github.com/hgslabs/cls3.git
 ! [rejected]        cl-781 -> cl-781 (non-fast-forward)
error: failed to push some refs to 'https://github.com/hgslabs/cls3.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
cls(cl-781)$ git checkout sprint015 
Switched to branch 'sprint015'
Your branch is up-to-date with 'origin/sprint015'.
cls(sprint015)$ git fetch 
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (9/9), done.
remote: Total 9 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (9/9), done.
From https://github.com/hgslabs/cls3
 * [new branch]      cl-676     -> origin/cl-676
cls(sprint015)$ git pull origin
Already up-to-date.
cls(sprint015)$ git rebase -i sprint015
Successfully rebased and updated refs/heads/sprint015.
cls(sprint015)$ git push origin cl-781
To https://github.com/hgslabs/cls3.git
 ! [rejected]        cl-781 -> cl-781 (non-fast-forward)
error: failed to push some refs to 'https://github.com/hgslabs/cls3.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
cls(sprint015)$ git pull origin sprint015
From https://github.com/hgslabs/cls3
 * branch            sprint015  -> FETCH_HEAD
Already up-to-date.
cls(sprint015)$ git checkout cl-781
Switched to branch 'cl-781'
cls(cl-781)$ git rebase -i cl-781
Successfully rebased and updated refs/heads/cl-781.
cls(cl-781)$ git push origin cl-781
To https://github.com/hgslabs/cls3.git
 ! [rejected]        cl-781 -> cl-781 (non-fast-forward)
error: failed to push some refs to 'https://github.com/hgslabs/cls3.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.