Syncing Shared Branches

Synchronizes a shared feature branch with its remote and resolves divergence. Use when a shared branch falls behind the trunk.

brokenrobot-xyz b00d919 518 B Updated

File contents

Sync a shared branch

Steps

  1. Fetch the remote and compare the local branch against the remote branch.
  2. When the branches diverge, merge the remote branch into the local branch.
  3. Push the result.

Guardrail

The remote branch must never be force-pushed to, as the collaborator's commits would be discarded without a warning.

brokenrobot-xyz/agent-skills/tree/main/plugins/writing-simplified-technical-english/evals/files/eval-guardrail-consequence-survives-rewrite commit b00d919066

Frequently asked questions

npx skillmds@latest add brokenrobot-xyz/syncing-shared-branches