Workflows

Sync Before Review

Sync your branch with main before opening review so reviewers see current, focused diffs instead of stale base noise.

Why this step matters

When a branch drifts too far from main, review gets noisier:

  • already-resolved upstream changes reappear as local context
  • stale base conflicts confuse the review
  • the stack becomes harder to interpret

Recommended flow

git fetch origin
git rebase origin/main
git diff --stat origin/main...

If your team prefers not to rewrite branch history:

git fetch origin
git merge origin/main

What to confirm before review

  1. your branch includes the latest mainline state
  2. the diff still matches the intended scope
  3. the latest commits are clean enough for reviewers to follow

Related Reads

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.

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.

PreviousFeature 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.

NextHotfix 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.