addressalign-toparrow-leftarrow-rightbackbellblockcalendarcameraccwcheckchevron-downchevron-leftchevron-rightchevron-small-downchevron-small-leftchevron-small-rightchevron-small-upchevron-upcircle-with-checkcircle-with-crosscircle-with-pluscrossdots-three-verticaleditemptyheartexporteye-with-lineeyefacebookfolderfullheartglobegmailgooglegroupshelp-with-circleimageimagesinstagramlinklocation-pinm-swarmSearchmailmessagesminusmoremuplabelShape 3 + Rectangle 1ShapeoutlookpersonJoin Group on CardStartprice-ribbonShapeShapeShapeShapeImported LayersImported LayersImported Layersshieldstartickettrashtriangle-downtriangle-uptwitteruserwarningyahoo


  • Aug 13, 2013 · 7:00 PM
  • This location is shown only to members

Git. It seems that everyone is using it and that everyone is using it in different ways. Always rebase, never rebase, always fast-forward, always no-fast forward, rewrite history, never rewrite history, always squash, git-flow, github-flow, commit-driven development, etc.

Like a good Unix command, Git doesn't care how you use it. It enables a wide variety of repository workflows. Used effectively, Git can spin the tale of your codebase: where it's been, where it's going, the problems encountered along the way. Used ineffectively, your Git history can become a dense mess of merges ballooning out into a multilane spaghetti highway that's impossible for a newcomer to navigate.

Stephen's talk will describe how to safely, sanely, and deliberately use Git to write the story of your code.

Stephen Ball has been programming since the 80s when he was introduced to BASIC by his older brother, Donald. In 2005, he started coding Ruby and hasn't stopped yet. He is now the lead developer at PhishMe and writes the popular "Rake Routes" blog.

Join or login to comment.

Our Sponsors

People in this
Meetup are also in:

Sign up

Meetup members, Log in

By clicking "Sign up" or "Sign up using Facebook", you confirm that you accept our Terms of Service & Privacy Policy