Git, beyond the basics

You've been storing your development work in git version control as long as you can remember, but have you learned more than the basics? Time to learn about rebasing commits, using feature branches, and creating pull requests. It's all coming to Drupal.org and is already supported by many SaaS hosting environments. Learn how and why to not commit to master, why you almost never want to use "git pull", and how to avoid those terrible messy merge commit conflicts.

 

Note to whoever decides: MarkFerree and I both separately created Sessions for this subject. We'd like to co-present rather than have competing Sessions. https://2015.badcamp.net/session/next-level-git

Session track:

Session skill level:

Session speaker(s):