Workflows
Git Workflows Channel
Break common collaboration routines into reusable flows, including sync strategy, feature-branch teamwork, review prep, and urgent fixes.
Workflows
Recommended Sequence
Start with the fetch-versus-pull boundary, then move into collaboration, pre-review sync, and urgent-fix flows.
fetch vs pull
Explains why fetch-first workflows are often more controllable than pulling directly.
02Feature Branch Collaboration
A practical feature-branch workflow for day-to-day teamwork, from cutting the branch and syncing main to cleaning the stack before review.
03Gitflow Workflow
Use Atlassian's Gitflow explanation to clarify the roles of main, develop, feature, release, and hotfix branches, plus where Gitflow still fits today.
04A sync routine for multi-person collaboration
Use a fetch-first, inspect-first sync rhythm in team collaboration so pull does not become a source of surprise or silent history mutation.
Workflows
Representative Topics
These topics show the channel at its best: sync boundaries, pre-review preparation, and urgent-fix sequencing.
fetch vs pull
Explains why fetch-first workflows are often more controllable than pulling directly.
Sync Before Review
Sync your branch with main before opening review so reviewers see current, focused diffs instead of stale base noise.
Hotfix and Urgent Fixes
Handle urgent fixes on a stable base, ship the smallest repair possible, and then flow that repair back into the branches that still need it.
Workflows
Channel Topics
Split recurring Git flows into scenario-based guides so teams can standardize sequencing and collaboration boundaries.
fetch vs pull
Explains why fetch-first workflows are often more controllable than pulling directly.
Feature Branch Collaboration
A practical feature-branch workflow for day-to-day teamwork, from cutting the branch and syncing main to cleaning the stack before review.
Gitflow Workflow
Use Atlassian's Gitflow explanation to clarify the roles of main, develop, feature, release, and hotfix branches, plus where Gitflow still fits today.
A sync routine for multi-person collaboration
Use a fetch-first, inspect-first sync rhythm in team collaboration so pull does not become a source of surprise or silent history mutation.
Prepare commit history before opening a pull request
Build a stable pre-PR routine around syncing, commit cleanup, risk checks, and review-friendly history.
Parallel Task Handling with Worktree
Use git worktree to open multiple working directories from the same repository when feature work, review fixes, and urgent tasks overlap.
Using git worktree as the default mode for AI coding agents
Turn git worktree into the default parallel-task mode for AI coding agents so implementation, review, validation, and hotfix work stay isolated and recoverable.
Sparse-checkout and worktree flow for monorepos
Use sparse-checkout and worktree together in a monorepo to reduce context load and support parallel task work without loading the whole tree every time.
Rerere for Recurring Conflicts
Use rerere to record and reuse conflict resolutions when the same merge or rebase conflicts appear again and again.
Sync Boundaries on Shared Branches
Define what is safe and unsafe on a branch shared by multiple people so sync stays predictable and history rewrites do not turn into team-wide incidents.
Sync Before Review
Sync your branch with main before opening review so reviewers see current, focused diffs instead of stale base noise.
PR Merge Strategy and Platform Settings
Make pull request merge policy and platform configuration part of the same decision so history shape and repository settings stay aligned.
Merge Queue Workflow
Use merge queues to control high-throughput PR merges, reduce stale-base retries, and make protected-branch integration more predictable.
Hotfix and Urgent Fixes
Handle urgent fixes on a stable base, ship the smallest repair possible, and then flow that repair back into the branches that still need it.
Rollback a failed hotfix after release
When a production hotfix causes new problems, first choose the rollback scope and stabilize the branch model before layering on more fixes.
Open Source Contribution with Fork + PR
Connect the full open-source contribution loop from fork and upstream sync through branch creation, pushing to your fork, and opening a pull request.
Release Branch Workflow
Explain when to cut a release branch, when to freeze features, and how to flow fixes back to main.
Backporting with Cherry-pick
Backport precise fixes onto maintenance branches without merging an entire feature branch.
Post-release Multi-branch Backporting
Control order, validation, and branch boundaries when one fix must be backported into multiple released maintenance lines.
Fork and Upstream Sync
Keep origin and upstream roles clear when collaborating through a fork workflow.
Choosing Squash Merge vs Rebase Merge
Compare how squash merge and rebase merge affect readability, traceability, and rollback options.
Maintaining Long-lived Branches
Show how long-lived branches can stay aligned with main and avoid painful late merges.
Conflict Governance for Long-lived Branches
Turn repeated long-branch conflicts from ad hoc firefighting into a managed process with sync cadence, hotspot tracking, and reusable conflict resolution.
Submodule Update Flow
Outline a safe routine for updating submodules, locking revisions, and syncing the parent repository.
Trunk-Based Development Workflow
Keep main continuously releasable by using short-lived branches, frequent integration, and small merge batches.
Stacked Pull Requests Workflow
Split a large change into dependency-ordered PR layers to improve review throughput and reduce oversized review fatigue.
Bisect Regression Triage Workflow
When something recently broke but ownership is unclear, use git bisect to isolate the first bad commit quickly and reproducibly.
Code Freeze and Release Candidate Workflow
Use freeze boundaries and release-candidate iterations to stabilize release scope and expose risk before production rollout.
Revert-First Stabilization Workflow
In high-impact regressions, restore service stability first and separate root-cause fixes afterward to reduce incident duration and secondary risk.
Feature Flag Rollout Workflow
Decouple code merge from user exposure by rolling features out gradually behind flags, reducing one-shot release risk.
Release Train Workflow
Ship on a fixed cadence so releases are schedule-driven rather than feature-driven, improving predictability across teams.
Cross-Repository Integration Workflow
Coordinate multi-repo changes with shared task IDs, dependency-aware release order, and integrated validation to reduce cross-repo breakage.
Canary Release Workflow
Validate new versions on a small slice of real production traffic before broad rollout to reduce blast radius.
Database Migration Safety Workflow
Reduce schema-change risk by splitting migrations into reversible, observable stages instead of one irreversible release step.
API Versioning Change Workflow
Handle breaking API changes with parallel version support, migration windows, and controlled deprecation to avoid client outages.
Incident Retro to Guardrail Workflow
Turn postmortem findings into enforceable CI, release, and runtime guardrails so lessons reduce future incident probability.
Pre-release Git checklist
Complete pre-release Git checklist: branch status, tag creation, changelog generation, version numbers, and CI verification.
CI/CD Git optimization
CI/CD Git optimization strategies: shallow clone, caching, partial clone, fetching only changes, and specific configurations for GitHub Actions and GitLab CI.
Trunk-based development workflow
Trunk-based development vs branch-based development comparison, feature flag integration, short branch lifecycle, and small-step commit practices.
Signing Commits Workflow
Use GPG or SSH to sign commits, establishing verifiable commit identity and a trusted collaboration chain.
Pre-commit Hook Workflow
Use pre-commit hooks to automatically run checks before code enters the repository, guarding the first gate of code quality.
Large File Handling Workflow
Use Git LFS, sparse checkout, and repository-splitting strategies to manage large files while keeping clone speed and history maintainable.
Rollback Deployment Workflow
Combine Git tags, revert, and fast branch switching to build a safe and controllable deployment rollback process.