~/talk

Merge Jam on My Gittoes: Split…

TalkinFrenchat BDX I/O 2025 · on Friday, 2025-11-07· [developer-experience]
links:none on file
links:none on file
slides:none on file

How to break a large feature into multiple focused pull requests to avoid huge diffs and review pain. It explains practical Git techniques—branching, rebasing, and tagging—to split work into unitary PRs and reduce merge conflicts, applicable across workflows.

AI-written summary · about

  1. 0:00Introduction
  2. 1:10Code review problems
  3. 2:35Classic Git merge workflow
  4. 4:00Classic Git rebase workflow
  5. 5:01Squash workflow problem
  6. 7:10Rebase onto solution
  7. 8:52Tags and reflog usage
  8. 10:35Error handling and undo
  9. 11:38Layered code reviews
  10. 12:21Long branches vs feature flags
  11. 14:06Q&A
~/search
type to search 6,249 conferences, 138,987 speakers and 185,172 talks
~/help
cmdctrl k
search every conference, speaker and series
/
focus the filter search
h
home
c
conferences
s
speakers
e
series
t
light / dark — the status bar button does the same
?
this help
esc
close this, then clear every filter — or just the search, while you are typing in it

Ignored while you are typing. Pages without a filter rail have no search to focus.