Workflows

Backporting with Cherry-pick

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

Scenario

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

Suggested sequence

  1. Identify the exact commit to backport
  2. Switch to the maintenance branch and cherry-pick
  3. Validate the resulting diff and tests

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.

PreviousRelease Branch Workflow

Explain when to cut a release branch, when to freeze features, and how to flow fixes back to main.

NextFork and Upstream Sync

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