Update a worktree to latest main

Table of Contents

When to use this skill

When the user asks to update, sync, or refresh a worktree against main — e.g. "update this environment to latest main", "sync my checkout", "bring this worktree up to date" — beyond a plain branch sync (see pr-sync-branch for that).

How to use this skill

  1. Fetch and detach onto the latest main commit:

    git fetch origin main && git checkout --detach origin/main
    

    Check git status --porcelain first; stash or commit anything unexpected before checking out.

  2. Sync the vcpkg submodule to what main's tree expects:

    git submodule update --init vcpkg
    
  3. Rebuild settings and skills so the Claude Code harness picks up org-source changes:

    ./projects/ores.compass/compass.sh build --direct settings
    ./projects/ores.compass/compass.sh build --direct skills
    

    Remind the user to /reload-skills afterwards.

  4. Verify with compass bearings — the "Is the environment up?" section flags any remaining =.env=/vcpkg/settings drift.

Recipes

Reference

Emacs 29.3 (Org mode 9.6.15)