Category Archives: tech
Vivosmart Smart Watch
Continue reading
Proxy Curl Through Charles Proxy
Test Incoming Webhooks Locally with Ngrok
Organising Inclusive Events
Hubot with Git Submodules
Git: upstream is gone
Your branch is based on 'origin/master', but the upstream is gone. (use "git branch --unset-upstream" to fixup)
I was delivering a workshop at the time so I kinda snarled at it and carried on with what I was doing, but later I looked up what is happening. This occurs when a branch is tracking a branch that the git repo doesn’t have any information about – the branches to be tracked aren’t in the local repo metadata.
In my case, it happened because I had created and then cloned an empty repo for training purposes – so origin/master
didn’t actually exist yet! I added a quick commit-and-push to my script and hope that I won’t be upstaged by this change that came in with git 1.8.5.
Hopefully this post will help someone else to avoid being upstaged or irritated by this as well!
5 Reasons to Consider Upgrading Your PHP Platform
Gollum the Git-Enabled Wiki
– must handle words and documents
– should be available locally, bonus points for revision history
– must publish to the web, and ideally be editable there
– should accept content in markdown
– must have access control (which wiped out my original plan of using a static site generator)
While I worked on this, we were using the wiki feature in GitLab … which pretty much hit the nail on the head. Further investigation showed that the wiki feature in GitLab (and indeed in GitHub) is a ruby gem called Gollum. Continue reading
Set Up Your First Hubot
Continue reading