~/talk

Git Makes Sense… Until Other People Get Involved

links:none on file
slides:none on file

Covers concrete team workflows: pushing straight to main versus feature branches with git checkout -b and resolving real merge conflicts in VS Code or PHPStorm, or using merge requests on GitHub/GitLab. Shows git flow with develop/release/hotfix branches, tagging for releases (v2.1), and forking for external contributors. Demonstrates tools and environments: GitLens, Oh My Zsh, Tugboat previews, Pantheon/Aqua, CI/CD pipelines (GitLab CI, GitHub Actions) and common recovery patterns like hotfix branches or rolling back to a previous tag.

AI-written summary · about

  1. 0:00Introduction and speaker intro
  2. 1:06What is Git and basics
  3. 6:46Branching strategies overview
  4. 7:07Committing to main branch
  5. 9:15Feature branching workflow
  6. 14:38Merge and pull requests
  7. 16:23Git flow explained
  8. 24:35Forking workflow
  9. 27:06Deployment environments
  10. 30:20CI/CD pipelines
  11. 33:50Code to production flow
  12. 37:05Q&A on rebasing and tags
  13. 43:04Handling production issues
  14. 45:09Closing and thanks
~/search
type to search 6,518 conferences, 143,918 speakers and 192,133 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
← →
on a talk: 5 seconds back / forward
0–9
on a talk: jump to 0%–90% of the recording
?
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.