Git Workflow
Git Signals Lab
Rebase, bisect, and recover from messy histories without panic-merging.
Description
This lab walks through realistic branch stacks, conflict resolution, and how to narrate history for reviewers. You keep a local practice repo that mirrors common open source flows.
Included focus
- Scenario cards for rebase vs merge decisions
- Recorded walkthroughs with chapter markers
- Office hours for recovering from a bad push
- Checklist for rewriting commits politely
- Practice reviewing someone else's diff
- CI log reading clinic
Outcomes
- Clean branch you can explain in three sentences
- Recovery playbook for the two most common git mistakes
- Reviewer-ready commit messages for a small feature
Reviews
Bisect finally made sense after the broken build exercise. I keep the flowchart on my desk.
Clear demos, though I wanted one more week on interactive rebase. Still worth it for the conflict drills.
FAQ
Which git clients are supported?
We teach the concepts in the terminal first, then map them to common GUI tools if you prefer.
Limitations?
We do not cover proprietary monorepo tooling from a single employer. Examples stay in neutral sample repositories.
Do I need Linux?
Windows, macOS, and Linux are all fine as long as you can run git 2.40 or newer.