~/talk

Comic book continuity and Git rebase

Talkat PHP UK Conference 2016 · 2016-02-18..02-19· [developer-experience]
links:none on file
slides:none on file

Uses Git rebase to keep feature branches replayed onto the latest master so pull requests produce a linear canonical history that avoids broken commits and speeds git bisect. Jenkins and Travis run tests, spin up immutable demo nodes per branch, and auto-deploy tagged releases to staging and production. Workflow permits rebasing locally and a force-push feature branch after resolving conflicts. Claimed result: small distributed teams (reported workable up to ~100 devs) get continuous deploys, cleaner history, and fewer integration surprises.

AI-written summary · about

  1. 0:00Introduction and philosophy
  2. 3:27The comic book metaphor
  3. 8:57Bridging comics and Git
  4. 11:41Technical workflow deep dive
  5. 15:49Practical implementation
  6. 20:13Git mechanics and terminology
  7. 23:25The integration cycle
  8. 28:34Handling conflicts and history
  9. 33:44Benefits of clean history
  10. 37:02Conclusion and resources
  11. 39:59Q&A session
~/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.