~/talk

The Power of Modern Version Control

Talkat PHP UK Conference 2015 · 2015-02-18..02-20· [php, open-source]
links:none on file
slides:none on file

Claim: combining Git and GitHub makes large-scale collaboration fast and auditable. Demonstrations show interactive rebase to rewrite history (rewriting commit messages and squashing) and git bisect binary search that locates the exact bad commit which removed a quote and broke hello world then is fixed. Explains fork/clone/branch/commit/push/pull request workflow, warns do not rebase public commits, and cites Linux kernel scale: ~1,300 contributors, ~1.5 GB repo, ~15M lines as motivation for Git performance.

AI-written summary · about

  1. 0:00Intro
  2. 1:54"Modern" Version Control?
  3. 5:11A Brief History
  4. 8:46Foundations
  5. 10:46Merge vs Rebase
  6. 13:42When to Rebase
  7. 16:57Workflows
  8. 19:42Changing History
  9. 27:13Debugging?
  10. 34:46GitHub - Workflow
  11. 46:27"The Power"?
~/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.