InfoQ Homepage Presentations The Git Parable
The Git Parable
Summary
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.
Bio
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.
About the conference
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.