Running Interactive Workshops on Git Internals and Rebase Workflows
Designed for Mid-level software engineers who regularly collaborate on complex codebases and are responsible for integrating multiple feature branches, but feel anxious or stuck when conflicts or 'weird' histories arise during rebasing. to spark real collaboration and high-energy learning.
A 90-minute hybrid workshop, with participants joining both physically and virtually. Many attendees have used Git daily for years but rely heavily on 'git pull' and 'merge'—interactive rebase is intimidating, and mysterious branch histories trigger confusion, making code review and integration feel risky and stressful.
Git History Time Machine
Kick off with a 'commit history scavenger hunt': participants receive a visual commit graph (with hashes and branches). Their challenge is to guess the sequence of actions (e.g., merge, rebase, cherry-pick) that created this shape. Unexpected patterns will spark curiosity about how the internals work.
Tap to view the full activity.
Why this works
This activity hooks intrinsic motivation. Presenting effects before causes primes the brain for pattern recognition and retrospective reasoning.
Mythbusting: Rebase Edition
Unpack common Git/rebase myths using a fast-paced poll: 'Fact or Fiction?' Statements like 'Rebase rewrites history for everyone' or 'You can’t recover lost commits after a rebase' are shown, and participants cast live votes before you reveal the truth.
Tap to view the full activity.
Why this works
Surfacing misconceptions explicitly helps dissolve anxiety, making new mental models stickier by rooting out old, faulty ones.
Safe Sandbox: Git Fumble Drill
Set up a shared dummy repo and invite volunteers to intentionally 'mess up' a rebase (e.g., create a conflict, squash the wrong commit) while everyone watches. The group helps untangle and recover, emphasizing process—not perfection.
Tap to view the full activity.
Why this works
Low-pressure, visible 'failures' lower the emotional stakes and reinforce that Git mistakes are recoverable and normal.
Rebase Relay: Speed Run
Turn rebase into a hands-on, energetic relay: in breakout teams, each member must perform a piece of an interactive rebase scenario (edit, squash, reorder) and 'pass the laptop' (or screen) to the next. Competitive timing and celebration for the smoothest history.
Tap to view the full activity.
Why this works
High-energy, time-bound collaboration encourages muscle memory and makes the steps stick through adrenaline and peer encouragement.
Merge vs. Rebase: The Product Launch Dilemma
Present a high-stakes scenario: 'You’re hours from a major deploy. Team A’s code depends on Team B’s. Do you merge or rebase? Why?' Each group debates which approach to use, documenting pros/cons and potential downstream effects.
Tap to view the full activity.
Why this works
Dilemmas foster critical thinking and real-world transfer—participants internalize the rationale, not just the command.
Commit Confessional: My Most Memorable Git Save
Invite each participant to write (on a sticky note or chat) about a time when Git either saved their bacon or created a memorable mess—and what they learned. Share highlights, then reflect on how their new rebase skills might change those outcomes.
Tap to view the full activity.
Why this works
Personal storytelling cements abstract concepts with emotional resonance and ownership.
Sign up to unlock 3 more activities
Get the full pack, facilitation flow, and more ready-to-run ideas.