Git Happens

Everyone knows that git happens. Let's roll around in it together.

Git Dojo: Plan

Git Dojo is one session where the more that goes wrong in the demo, the better. The following is a general plan, but when we go astray, great. The goal is to show what to do when you get off the happy path.



Make a commit

Oh crap, I should have done that on a branch

Oh crap, I meant to do that on the new branch

Oh crap, that small change should be in its own commit

Make another change

fetch the latest

rebase our branch in, interactively

oh crap, I lost a commit!

merge a pull request

try to push our changes

merge our changes in