Search Results for: git

Search Icon

Git Pull Causes a Merge

If you type git pull and expect a fast-forward update, but get a merge instead, don’t panic! This usually happens when we’re collaborating on a branch with other people, and we’ve made changes on our local version of a branch, … Continue reading →
Search Icon

Advanced Adventures in Git

This was the inaugural PHP South Coast conference and I hope it was the first of many, it was extremely well done with a great crowd and great lineup. The even let me speak and I had the last slot … Continue reading →
Search Icon

Git Fundamentals Screencast

This screencast series was a fun collaboration with O’Reilly. Because it’s aimed specifically at web developers, I felt I had the freedom to include code samples (I usually don’t when teaching git) and you’ll find some Python and NodeJS in … Continue reading →
Search Icon

Git: upstream is gone

I came across a git repo recently that output this message with every operation I did: 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 … Continue reading →
Search Icon

Gollum the Git-Enabled Wiki

In trying to get company documentation off google docs and people’s laptops and into a more useful format, I have been researching developer-friendly tools for business documentation. Requirements went something like: – must handle words and documents – should be … Continue reading →
Search Icon

Git Branches for Fun and Profit

I gave this talk at Day Camp for Developers, a virtual conference attended by people all over the world. This makes for fun with timezones, but luckily I was allowed to have the first slot so that I was still … Continue reading →