#Workflow
8 posts
Practical Git Workflows #7: Monorepos and Git — sparse-checkout, Submodules, and LFS
Why Git slows down as a repository grows, and when to reach for partial clone, sparse-checkout, submodules, and Git LFS. The final part of the Practical Git Workflows series.
Practical Git Workflows #6: stash, cherry-pick, bisect — Everyday Tools
stash to absorb urgent context switches, cherry-pick to move a single commit to another branch, and bisect to find the commit that introduced a bug by binary search. Three tools that are hard to do without at the moment you need them.
Practical Git Workflows #5: Running Pull Requests — Review Size, Commit Messages, and Draft PRs
Criteria for splitting PRs into reviewable sizes, the Conventional Commits convention, draft PRs and self-review, PR templates and branch protection. Running Pull Requests from the operations point of view.
Practical Git Workflows #4: Resolving Conflicts — Structure, mergetool, and rerere
Understand conflicts through the base, ours, and theirs structure and handle them with tools. Why ours and theirs look flipped during a rebase, zdiff3 markers, the VS Code merge editor, and rerere so you never solve the same conflict twice.
Practical Git Workflows #3: Interactive Rebase — Cleaning Up Commits with squash and fixup
Interactive rebase reshapes commits into readable units before you open a PR. We cover the six todo-list commands, the fixup and autosquash workflow, and pushing a rewritten branch safely with force-with-lease.
Practical Git Workflows #2: rebase vs merge — Decision Criteria and the Golden Rule
See through diagrams how rebase re-applies commits as brand-new ones, and build criteria for choosing between rebase and merge. Includes the structural reason you must never rebase a shared branch.
Practical Git Workflows #1: Branching Strategies — GitHub Flow and Trunk-Based
Compare the structure and prerequisites of Git Flow, GitHub Flow, and trunk-based development, and build criteria for choosing one based on team size and release cadence.
AWS Advanced #7: Step Functions
Where state machines fit, the four states (Task / Choice / Parallel / Map), Standard vs Express, Lambda / ECS / SDK integrations, error handling with retry / catch, common patterns — the AWS workflow service.