sync

You are syncing this org-os clone with the shared remote. Vault-safe: NEVER git stash, git clean, or git reset --hard. Only ever fast-forward; never run an unattended merge/rebase that could rewrite many notes.

Step 1: Read state

git rev-parse --abbrev-ref HEAD                 # current branch
git fetch --quiet origin 2>/dev/null && echo "fetched" || echo "offline — local state only"
git status --porcelain | wc -l                  # uncommitted file count

Step 2: Branch logic

• On main → main is integration-only. Tell the operator to switch to their trunk (git switch <operator>; their operator slug). Don't pull onto main here.
• No upstream (git rev-parse --abbrev-ref @{u} fails) → the branch isn't tracking a remote. Tell them: git push -u origin <branch>.
• Uncommitted changes present → do NOT fast-forward (it could collide). Report the dirty files and suggest running /commit first.
• Clean + has upstream → continue to Step 3.

Step 3: Fast-forward only

git merge --ff-only @{u} 2>&1 || echo "not fast-forwardable — your branch has diverged from its upstream; review before merging"

(Fast-forward on a clean tree is snapshot-exempt: Step 2 guaranteed no uncommitted content exists, and an ff only moves the branch pointer over committed history — nothing can be lost.)

Step 4: Report drift vs main — and offer to pull it in

git rev-list --left-right --count origin/main...HEAD 2>/dev/null | awk '{print "vs origin/main: behind "$1", ahead "$2}'
# If behind, show WHICH shared files main has that this trunk lacks (the actionable part):
git diff --stat HEAD...origin/main -- '*.md' 'data/*.yaml' 'docs/**' 'skills/**' 'packages/**' '.claude/**' 2>/dev/null | tail -12

Report in 2–3 lines: current branch, whether it fast-forwarded, ahead/behind origin/main, and any uncommitted files.

main is the shared consolidation layer — teammates' merged plans, data, and tooling land there, and your trunk does not receive them automatically. Fast-forwarding your trunk (Step 3) only pulls your own pushed history, not main's. So a file a teammate consolidated to main (e.g. a plan doc) will be missing from your trunk until you pull main in — this is the #1 "I don't have that file" gotcha.