~/talk

IS NOW Git Legit

Talkat PHP UK Conference 2023 · 2023-02-14..02-16· [php, developer-experience]
slides:none on file

Argues that switching to atomic commits actually cuts rebase conflict repetition by turning scattered checkpoint commits into single-purpose units, shows recorded demos of using interactive rebase, amend, reset, fixup/squash, and force-push-with-lease, and demonstrates cherry-pick, drop, and automated git bisect to find a regression; promises concrete git commands and workflows, the tradeoffs of squash merges and protected main branches, and live examples that rewrite history and then successfully force-push so you can see it work end to end.

AI-written summary · about

  1. 0:00Git Legit introduction
  2. 1:09Atomic commits matter
  3. 4:19Merge vs rebase with atomic
  4. 8:37Rebasing fails without atomic
  5. 9:22Cleaner Git history
  6. 10:04Checkpoint vs atomic commits
  7. 13:17Amending commits
  8. 15:25Interactive rebase
  9. 18:17Rewriting history with force
  10. 20:46Efficient code reviews
  11. 23:38Clear commit messages
  12. 28:15Automate commit messages
  13. 30:02Quick wins from atomic
  14. 31:46Cherry picking commits
  15. 32:08Dropping commits
  16. 34:15Finding bugs with bisect
  17. 39:37Rewriting history concerns
  18. 41:01Fixing messy commits
  19. 43:25Force push safety
  20. 45:14Q&A on Git workflows
~/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.