A Software Engineer's Guide to Mastering Git Merge and Rebase
Designed for Mid-level software engineers working on collaborative, multi-branch projects in fast-paced Agile teams who regularly face merge conflicts and workflow confusion. to spark real collaboration and high-energy learning.
A 90-minute virtual workshop. Attendees are mid-level engineers with solid Git basics, but frequently struggle with merge conflicts, unclear team workflows, and anxiety over breaking the main branch. The session is hands-on, highly interactive, and designed to bridge the gap between rote commands and real-world team collaboration.
Merge vs. Rebase Mystery Poll
Kick off with a fast, anonymous poll: 'Which Git command do you use when you want to keep a clean, linear project history?' Participants choose between 'merge' and 'rebase.' Reveal the results, then present a visual timeline showing the difference using real-world repo diagrams. This ignites curiosity and questions about the why behind their choices.
Tap to view the full activity.
Why this works
Opening with a curiosity-driven poll primes the group for learning by surfacing gaps and prompting immediate engagement. Visuals anchor abstract concepts in concrete examples.
Git Mythbusters Quiz
Run a rapid-fire, interactive quiz: 'True or false — Rebasing rewrites history and can break shared branches.' Debrief with concise explanations and mini demos, busting myths such as 'merge is always safer' or 'rebase is only for experts.' Participants learn through confronting common misconceptions.
Tap to view the full activity.
Why this works
Addressing misconceptions directly helps learners update mental models and trust their skills. Quizzes lower resistance and make abstract concepts tangible.
Silent Merge Conflict Walkthrough
Participants are given a step-by-step merge conflict scenario to quietly walk through in their own editor or on an online sandbox. No talking, just follow the steps. After 4 minutes, everyone posts their 'aha!' moments or errors in chat. Facilitator reviews key takeaways live.
Tap to view the full activity.
Why this works
Low-pressure, solo activity fosters safe exploration and risk-free practice, helping participants remember by doing.
Git Showdown Challenge
Split the group into two teams. Give each a brief: 'Your team must resolve this conflict and update the branch using either merge or rebase.' Teams race to solve, then present their solution (screenshare or whiteboard) with a quick rationale. Facilitator spotlights clever tactics and explains team-based workflow impacts.
Tap to view the full activity.
Why this works
High-energy collaboration turns technical tasks into friendly competition, boosting engagement and retention.
Real-World Merge Dilemma
Present a real-world dilemma: 'You’re days from release. A teammate rebased their feature, while you merged yours. Now, the team is facing confusing histories and conflicts. What would you do?' Invite small groups to brainstorm strategies and share their decision logic. Facilitator highlights practical pros/cons in each approach.
Tap to view the full activity.
Why this works
Connecting abstract concepts to real dilemmas makes learning stick and encourages critical thinking.
Merge/Rebase Reflection Wall
Wrap with a virtual or physical wall: 'Write one sentence — how will you approach merge vs. rebase differently after today?' Participants post their statements. Facilitator spotlights a few, drawing personal connections and actionable commitments.
Tap to view the full activity.
Why this works
Reflection supports retention and personalizes new skills, helping participants anchor lessons in their own workflow.
Sign up to unlock 3 more activities
Get the full pack, facilitation flow, and more ready-to-run ideas.