Skip to main content

Feature Branches as an Art

Matthew McCullough (GitHub), Brent Beer (GitHub)
Tools, Platforms, and APIs
Location: Salon 14
Average rating: ****.
(4.67, 6 ratings)

Building a feature branch is an art. You want it to communicate as much as possible and be as orderly as possible for both the recipient and future reviewers. Learn how to polish a feature branch to a mirror-like shine by using a powerful combination of cherry pick and interactive rebase to put all your commits in the right place.

Photo of Matthew McCullough

Matthew McCullough

GitHub

Matthew McCullough, Training Pioneer for GitHub, is an energetic 15 year veteran of enterprise software development, world-traveling open source educator, and co-founder of a US consultancy. All of these activities provide him avenues of sharing success stories of leveraging Git and GitHub. Matthew is a contributing author to the Gradle and Jenkins O’Reilly books and creator of the Git Master Class series for O’Reilly. Matthew regularly speaks on the No Fluff Just Stuff conference tour, is the author of the DZone Git RefCard, and is President of the Denver Open Source Users Group.

Photo of Brent Beer

Brent Beer

GitHub

Brent Beer is a solutions engineer for GitHub in Amsterdam, helping bring Git and GitHub to developers across the world. Brent has used Git and GitHub for over five years in university classes and contributions to open source projects and professionally as a web developer. While working as a trainer for GitHub, he also became a published author for O’Reilly.