Skip to content

my-achrchon-sync: upstream dev is 202 commits ahead #6

Description

@github-actions

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.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions