gistfile1.txt

erik%git status                                                                Sites/courseload/clip 11:52AM
# On branch checkout-ui
# 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:   src/media/js/nav.coffee
#
no changes added to commit (use "git add" and/or "git commit -a")
erik%git status                                                                Sites/courseload/clip 11:52AM
# On branch checkout-ui
# 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:   src/media/js/nav.coffee
#
no changes added to commit (use "git add" and/or "git commit -a")
erik%git stash                                                                 Sites/courseload/clip 11:55AM
Saved working directory and index state WIP on checkout-ui: fb5d8b8 fixed dropdown overlay display issues for instructors
HEAD is now at fb5d8b8 fixed dropdown overlay display issues for instructors
erik%git rebase origin checkout-ui                                             Sites/courseload/clip 11:55AM
First, rewinding head to replay your work on top of it...
Applying: started setting up checkout/sharing/print exposure
Applying: removed display of Sharing & Print when nav is not on book level
Applying: fixed js null error for dialog closure
Applying: adjusted contrast on material option buttons
Applying: changed coursemater checkout variables from material to classmaterials for standardization
Applying: template-tized checkout functionality
Applying: Make some changes to implement the inline installation feature, as well as move around some code to reduce repetition.
Applying: changed tag styles to indicate entire button is clickable
Applying: Hide assignments when offline
Applying: re-added busy download conditional
Applying: fixed drop down display issue
Applying: Use 'chrome.app.runningState()' method instead of checking the 'chrome.app.isInstalled' property.
Applying: Update comment to reflect method being invoked.
Applying: fixed dropdown overlay display issues for instructors
erik%git status                                                                Sites/courseload/clip 11:55AM
# On branch checkout-ui
nothing to commit (working directory clean)
erik%git stash pop                                                             Sites/courseload/clip 11:56AM
# On branch checkout-ui
# 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:   src/media/js/nav.coffee
#
no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (6828dc51253f76ae81487d77c90f9445117c58f1)
erik%git status                                                                Sites/courseload/clip 11:56AM
# On branch checkout-ui
# 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:   src/media/js/nav.coffee
#
no changes added to commit (use "git add" and/or "git commit -a")
erik%git commit -a -m 'added preventDefault to checkin functionality'          Sites/courseload/clip 11:56AM
[checkout-ui c4b13ad] added preventDefault to checkin functionality
 1 file changed, 4 insertions(+)
erik%git push origin checkout-ui                                               Sites/courseload/clip 11:58AM
To https://github.com/courseload/clip.git
 ! [rejected]        checkout-ui -> checkout-ui (non-fast-forward)
error: failed to push some refs to 'https://github.com/courseload/clip.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
erik%git pull origin checkout-ui                                               Sites/courseload/clip 11:58AM
^C
erik%git merge origin checkout-ui                                              Sites/courseload/clip 11:58AM
Already up-to-date.
erik%git push origin checkout-ui                                               Sites/courseload/clip 11:59AM
error: The requested URL returned error: 403 while accessing https://github.com/courseload/clip.git/info/refs
fatal: HTTP request failed
erik%git push origin checkout-ui                                               Sites/courseload/clip 12:00PM
To https://github.com/courseload/clip.git
 ! [rejected]        checkout-ui -> checkout-ui (non-fast-forward)
error: failed to push some refs to 'https://github.com/courseload/clip.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
erik%git status                                                                Sites/courseload/clip 12:01PM
# On branch checkout-ui
nothing to commit (working directory clean)
erik%git merge --ff-only origin checkout-ui                                    Sites/courseload/clip 12:02PM
Already up-to-date.
erik%git push origin checkout-ui                                               Sites/courseload/clip 12:02PM
To https://github.com/courseload/clip.git
 ! [rejected]        checkout-ui -> checkout-ui (non-fast-forward)
error: failed to push some refs to 'https://github.com/courseload/clip.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
erik%git pull origin checkout-ui                                               Sites/courseload/clip 12:02PM
From https://github.com/courseload/clip
 * branch            checkout-ui -> FETCH_HEAD
Merge made by the 'recursive' strategy.
erik%git push origin checkout-ui                                               Sites/courseload/clip 12:03PM
error: The requested URL returned error: 403 while accessing https://github.com/courseload/clip.git/info/refs
fatal: HTTP request failed
erik%git push origin checkout-ui                                               Sites/courseload/clip 12:04PM
Counting objects: 104, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (88/88), done.
Writing objects: 100% (88/88), 11.08 KiB, done.
Total 88 (delta 65), reused 0 (delta 0)
To https://github.com/courseload/clip.git
   fb5d8b8..1a31d28  checkout-ui -> checkout-ui