Git Fundamentals: Mastering Merges and Workflows

1 day
$ 350 per attendee


David Pascoe-Deslauriers

Git Fundamentals: Mastering Merges and Workflows

Following up on our Git Fundamentals: Learning the Basics we’ll dive into how to master merges, cherry-pick commits and apply modern workflows to your projects. We’ll go over how to leverage git for truly distributed workflows. We’ll use a Drupal project as our basis for commiting code, using issue branches, making pull/merge requests and some more advanced features of the most popular web-based Git tools: GitHub and GitLab.

What we’ll be covering:

  • Power git commands (git merge, git cherry-pick, git rebase, etc…)
  • Advanced techniques with GitHub and GitLab
  • Branching, tagging, merge/pull requests, protecting branches
  • Packaging releases with Drupal

We recommend (but in no way require) that participants come with some knowledge of the following:

  • Git Fundamentals: Learning the Basics
  • Git CLI
  • GitHub and/or GitLab

This is a full day training session and pre-registration is required for all attendees.

This is a BYOD (Bring Your Own Device) session. We recommend bringing a laptop running a modern operating system (e.g. Windows 7 or later, OS X 10.10 or later, Ubuntu 14.04 or later). We do have a spare Windows 7 laptop available on a first-come-first-serve basis.

There is free parking available both in the parking lot as well as on the street. We’ll take a 45 minute break for lunch and a 15 minute morning and afternoon break as well. Lunch is included.