Johan Herland explains how Git does branching and merging in a distributed (and partially disconnected) environment, how to rewrite a commit history, and why staging is useful.
Johan Herland is a software developer at Cisco in Oslo, Norway, developing the next generation of video conferencing solutions. Johan started meddling with distributed version control and Git in 2007, and has been heavily involved in migrations from CVS to git (at Opera) and Subversion to Git (at Cisco). He also occasionally contributes patches to Git itself.
ACCU is an organisation for anyone interested in developing and improving programming skills. ACCU welcomes everyone who is interested in any programming language. ACCU supports its members by hosting mailing lists, running a yearly conference, publishing journals and organising online study groups.
1. it really didn't feel like a parable. there was a very loose story initially, but disintegrated into pure technical instruction very rapidly.
2. due in large part to the apparent lack of a wireless pointer/slide-advancer, Johan had to shuffle between the screen and his computer, making for a stop-go delivery
3. very long. with more rehearsing and editing, this could be done in 30-45 mins instead of 85 mins, which will help ADD/ADHD people like me :)
I saw a first few minutes
Re: decent try
Also I found the slides rather good. The original post by Preston-Werner is text only.
Very interesting talk
But this was a very interesting talk nevertheless! Easier to follow than the blog entry that doesn't have any picture...