Git Workflow Etiquette: Repository Organization for Clean Codebases
summary
Practical checklist: use GitHub, prefer rebase over merge (rebase locally, rebase-on-merge in PRs; avoid squashing), adopt branch names like username/issue/short-description, format commits as type(scope) subject footer linking to issue, run fetch + prune + rebase before pushing, force-push only after rebasing that branch, use git diff/log/blame and GitLens, make PRs self-contained with changelist from commits, delete merged branches, treat issues as discussion threads and acknowledge reviewers before deep responses.
AI-written summary · about
chapters (21)
- 0:00Intro
- 1:28About me
- 2:38About Git
- 4:24Branching vs Forking
- 5:40Naming Conventions
- 8:12Rebasing vs Merging
- 10:12Interactive Rebasing
- 12:27Force Push
- 12:59Rebasing
- 16:07Git Status
- 17:42Git blame
- 18:22Git commit messages
- 22:07Git pull requests
- 30:42QA
- 36:07Rebates vs Merge
- 37:07Stage Code
- 39:07Rebase vs Merge
- 40:07Branching workflows
- 41:07Merging vs Rebasing
- 42:07Staging
- 44:07Final Thoughts
