Git Makes Sense… Until Other People Get Involved
summary
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
chapters (14)
- 0:00Introduction and speaker intro
- 1:06What is Git and basics
- 6:46Branching strategies overview
- 7:07Committing to main branch
- 9:15Feature branching workflow
- 14:38Merge and pull requests
- 16:23Git flow explained
- 24:35Forking workflow
- 27:06Deployment environments
- 30:20CI/CD pipelines
- 33:50Code to production flow
- 37:05Q&A on rebasing and tags
- 43:04Handling production issues
- 45:09Closing and thanks
