going crazy
Merge branch 'branchlet'

vim is weird
Merge branch 'master' of https://github.com/scrummyin/Git-Time-Trials

"lost wifi for a sec"

t pu# especially if it merges an updated upstream into a topic branch.