Session Spotlight

Abbey Perini

Camp Counselor

#gitPanic - Merging and Rebasing

Wednesday, July 31, 2024 - 3:30 PM UTC, for 1 hour.

Regular, 60 minute presentation

Room: African 30

git

gitPanic

GitHub

version control

Git is hard. It's also something you're often expected to know in depth, but rarely taught more than the basics. This talk takes more complicated git topics and breaks them down. You should walk away with the terminology and information you need to navigate conversations about merging and rebasing in a team work setting.

Prerequisites

Ideally you will have created a branch and committed work before. If you haven't, don't worry! We'll cover that too!

Take Aways

What git is
What git does
How to merge, rebase, cherry-pick, fetch, squash, and resolve merge conflicts
What information git stores and how to find it
Why merging and rebasing are necessary
Benefits of merging vs rebasing
How to escape a bad merge or rebase
What are refs, how to use them, and why they are your friend

Supporting Resources

#gitPanic series

The blog series the talk is based on. It has all the information in the talk and more.

favorited by: