Git Bootcamp
A one-week sprint to be productive with git in any team workflow.
Bootcamp plan
EXAMPLE
# Git bootcamp - 5 working days Day 1 - Concepts: working tree, index, HEAD, branches, refs, objects. Day 2 - Daily flow: add, commit, push, pull --rebase, fetch, diff. Day 3 - Branching: trunk-based, feature branches, environment branches; squash + merge. Day 4 - History tools: bisect, reflog, rerere, cherry-pick, interactive rebase, autosquash. Day 5 - Collaboration: GitHub/GitLab/Bitbucket PR flow, signed commits, CODEOWNERS, protected branches. Weekend project: contribute one PR to an open-source project end to end. ## Tips - Trunk-based + short-lived branches beats long-lived environments - Squash merge keeps history readable; merge commits keep blame trails - Sign commits + signed tags for releases - Use a GUI sparingly; the CLI is the source of truth ## Common mistakes - Force-push without --force-with-lease - git pull without --rebase, creating many micro-merge commits - Skipping pre-commit hooks (linters, format) and breaking CI - Committing build artefacts because .gitignore is wrong ## Capstone Ship a feature on a fork: branch, commit cleanly, rebase, open PR, address review, get it merged.
Why it matters
Git is plumbing more than UI. A week is enough to be confident with the daily commands and recovery tools. The capstone PR is when the abstractions click.
Tip: Tweak the snippet with Try it Yourself », then sit the quiz at the bottom of the page.
Discussion
Loading…