Tag
workflow
Published articles tagged workflow.
Code review and pull request hygiene
Good pull requests are small, test-backed, and easy to revert; good reviews focus on design and risk, not style nitpicks. Practices for authors and reviewers when Git history is shared on a protected main branch.
Collaborating with Git
Git stores history; teams add agreements on top—who merges, how branches are named, and how review happens before code reaches main. This overview maps those social layers to remotes, pull requests, and protected branches.
Git workflows for teams
Trunk-based development, Git Flow, and GitHub Flow compared—how branch lifetimes, release cadence, and CI maturity drive the model, plus scaling patterns for monorepos and open source.
Merging versus rebasing
Merge and rebase both integrate branch work, but they rewrite history differently—one adds merge commits, the other replays commits on a new base. Compare fast-forward merges, conflict resolution, squash merges, interactive rebase, and when each approach fits a team.
Pull requests with and without GitHub
Review and integrate changes through pull requests on GitHub—or through email patches and git request-pull when no host is involved. Covers forks, the PR lifecycle, merge strategies, branch protection, and the gh CLI.