Git Workflow Strategies for Teams
Compare Gitflow, trunk-based, GitHub Flow, and Ship/Show/Ask. Learn which git workflow fits your team, with branch naming and PR conventions.
15 posts · page 1 of 1
Compare Gitflow, trunk-based, GitHub Flow, and Ship/Show/Ask. Learn which git workflow fits your team, with branch naming and PR conventions.
Master parallel feature development with git worktrees. Run multiple branches simultaneously, handle urgent hotfixes without stashing, and optimize team workflows.
Learn the TDD workflow with real examples in Python and JavaScript. Covers red-green-refactor, when TDD works best, and how to handle common challenges.
Advanced git rebase strategies for teams: interactive rebase workflows, rebase --onto, autosquash, and policies that keep shared branches clean without rewriting public history.
Walk through the red-green-refactor cycle step by step, building a password validator to learn practical test-driven development.
Use git bisect to binary-search through history and pinpoint the commit that introduced a regression, with manual and automated examples.
Learn how to copy specific commits across branches with cherry-pick and how to safely undo merged changes with revert, including conflict handling and recovery.
How to open pull requests reviewers actually enjoy: small scope, clear descriptions, good commit hygiene, useful CI, and how to handle review feedback without endless back-and-forth.
A clear, practical guide to choosing between git rebase and git merge, with safe workflows for feature branches, shared branches, and pull requests.
Learn how to use git stash to safely shelve uncommitted changes, switch contexts, and recover work using push, pop, apply, and branch workflows.
Use git worktree to check out multiple branches at once without cloning. Speed up code review, hotfixes, and experimentation.
Compare trunk-based development, gitflow, and GitHub flow. Learn when each strategy fits, how they affect release cadence, and which commands to actually use day to day.
A deeper look at git rebase — the mechanics, interactive rebase with squash/fixup/edit/drop, the golden rule of published branches, conflict resolution, and rerere for repeated conflicts.
Understand Git remotes, the difference between origin and upstream, fetch vs pull, the forking workflow, and how to open a pull request that is easy to review.
Learn to stash work in progress, undo commits with restore, reset, and revert, and recover lost work from the reflog — with clear warnings about which commands rewrite history.