Daily upstream drift check found new changes in coleam00/Archon:dev.
Use the repo-local my-achrchon-sync skill to merge this safely into the personalized fork.
Expected manual flow:
git checkout dev
git fetch --all --prune
git checkout -b codex/merge-upstream-dev-YYYY-MM-DD
git merge upstream/dev
# resolve conflicts with broad preservation of fork-local Codex/PIV assets
bun install
bun run generate:bundled
bun run validate
git checkout dev
git merge --ff-only codex/merge-upstream-dev-YYYY-MM-DD
git push origin dev
Protected fork-local paths by default:
.agents/skills/**
.archon/workflows/defaults/*codex*
.archon/commands/defaults/*codex*
docs/design/**
docs/prd/**
docs/plans/**
This action does not auto-merge upstream changes.
Daily upstream drift check found new changes in
coleam00/Archon:dev.59bbd00b3231378ae546620b929cb2b354c8802169b2c8978b589a30e2b01ee77897a770d714d630Use the repo-local
my-achrchon-syncskill to merge this safely into the personalized fork.Expected manual flow:
git checkout dev git fetch --all --prune git checkout -b codex/merge-upstream-dev-YYYY-MM-DD git merge upstream/dev # resolve conflicts with broad preservation of fork-local Codex/PIV assets bun install bun run generate:bundled bun run validate git checkout dev git merge --ff-only codex/merge-upstream-dev-YYYY-MM-DD git push origin devProtected fork-local paths by default:
.agents/skills/**.archon/workflows/defaults/*codex*.archon/commands/defaults/*codex*docs/design/**docs/prd/**docs/plans/**This action does not auto-merge upstream changes.