Erik Peterson

We've all been there. We've heard it all before. Git will save you time, money, and effort. It'll preserve your history, save your bacon and fry it up in a pan. Git won't leave without saying thank you. Git won't talk about you behind your back. You would bring Git home to meet your parents.

Drupal.org switched over to git, that's old news. Now it looks like we might even move to GitHub. You've learned the four commands that you use over and over to be able to craft a commit and push to origin. You are _pretty sure_ you understand branching. People ask if you "rebase" or "merge" in the same way they asked if you were for or against the death penalty.

But… what does all of this git stuff do? The mysterious vocabulary of "rebase", "revert", "reset" are terms that we Google and sometimes use when we're deep in trouble and need to find away out of that merge conflict. But we don't know _why_ we use them or really what they're doing. We're just looking for that enigmatic message "nothing to commit, working tree clean".

This session will pull back the covers a bit. We'll take a quick look at the plumbing behind the porcelain and talk about a few of the things that make git tick. Commits, blobs, and trees are actually easy to understand once we look behind some of the drywall. Hopefully after this session, you won't know the exact hashing algorithms, but you'll be comfortable knowing what a fast-forward merge actually accomplished and why it looks so nice.

This session is for people who've set up git, used git in normal workflows, but just have that nagging feeling that if they just understood a little bit more.

https://nedcamp.org/new-england-drupal-camp/sessions/cant-we-all-just-git-along