Skip to content

Document Git workflow - #24

Merged
Clearner1 merged 2 commits into
mainfrom
codex
Aug 14, 2026
Merged

Document Git workflow#24
Clearner1 merged 2 commits into
mainfrom
codex

Conversation

@Clearner1

Copy link
Copy Markdown
Owner

What changed

  • Define main as the production branch and codex as the long-lived development/integration branch.
  • Use feature/<slug> only when isolation is useful.
  • Require PR-based releases, the existing two-worktree layout, and clean handoffs.

Why

The repository previously accumulated overlapping worktrees and codex/* branches. A single documented flow prevents that drift while keeping ordinary development lightweight.

Impact

Future Codex sessions get the branch and worktree rules directly from AGENTS.md. No application or deployment behavior changes.

Checks

  • git diff --check
  • Remote branch and upstream read-back

@Clearner1
Clearner1 marked this pull request as ready for review August 14, 2026 05:11
@Clearner1
Clearner1 merged commit dc057fe into main Aug 14, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant