Workflows

Fork and Upstream Sync

Keep origin and upstream roles clear when collaborating through a fork workflow.

Scenario

Keep origin and upstream roles clear when collaborating through a fork workflow.

Suggested sequence

  1. Use your fork as origin
  2. Add the canonical repository as upstream
  3. Fetch upstream regularly and sync your local main branch

Why this order is safer

The value of a workflow usually comes less from a single command and more from fixing the order of observation, action, and recovery.

Related commands

This topic makes more sense alongside commands such as git fetch, git log, git diff, git merge, git rebase, or git cherry-pick.

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.

Sync Before Review

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

PreviousBackporting with Cherry-pick

Backport precise fixes onto maintenance branches without merging an entire feature branch.

NextChoosing Squash Merge vs Rebase Merge

Compare how squash merge and rebase merge affect readability, traceability, and rollback options.