Skip to content

Promote Develop to Main - #874

Merged
ptr727 merged 1 commit into
mainfrom
develop
Aug 20, 2026
Merged

Promote Develop to Main#874
ptr727 merged 1 commit into
mainfrom
develop

Conversation

@ptr727

@ptr727 ptr727 commented Aug 20, 2026

Copy link
Copy Markdown
Owner

Summary

Promote the current develop branch to main.

Included change:

  • require verified post-merge worktree and branch cleanup, then restore the primary checkout to current develop (#873)

Merge method

Merge commit only. Preserve develop after merge.

## Summary

- make worktree and branch cleanup a required post-merge terminal step
- safely handle squash-merged branches through live PR and clean-tree
verification
- return the primary checkout to fetched, fast-forwarded `develop`
- route PR, promotion, and release completion through the cleanup
procedure

## Validation

- `python3 scripts/build_dist.py --check`
- `python3 scripts/tests/test_build_dist.py`
- `python3 scripts/prose_lint.py --check sentence-length --diff
origin/develop`
- `python3 scripts/prose_lint.py --check sentence-split --diff
origin/develop`
- `markdownlint-cli2` over 158 Markdown files
- `git diff --check`
Copilot AI lite review requested due to automatic review settings August 20, 2026 15:04

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Promotes the current develop state into main by updating the fleet Skills distribution to require verified post-merge cleanup (worktrees/branches) and restoring the base clone back to a clean, fast-forwarded develop as the default terminal step after merges/promotions/releases.

Changes:

  • Make post-merge cleanup the default terminal step in the repo-worktree procedure, including verification gates before removal.
  • Extend the PR loop and release workflow guidance to require running the post-merge cleanup after authorized merges/promotions/releases.
  • Define a narrow, verification-gated exception permitting git branch -D for post–squash-merge cleanup of the exact verified task branch.

Reviewed changes

Copilot reviewed 13 out of 13 changed files in this pull request and generated no comments.

Show a summary per file
File Description
.github/skills/repo-worktree/SKILL.md Expands the post-merge cleanup procedure with verification, removal steps, and base-clone reset to develop.
.github/skills/pr-review-conduct/SKILL.md Requires repo-worktree cleanup after an authorized merge to complete the PR loop.
.github/skills/operational-vs-release-workflow/SKILL.md Adds a release/promotion terminal step requiring cleanup and returning the base clone to develop.
.github/skills/git-commit-conventions/SKILL.md Adds a narrowly-scoped exception allowing git branch -D after a verified squash merge per repo-worktree.
.claude-plugin/fleet-skills/skills/repo-worktree/SKILL.md Mirrors the updated repo-worktree cleanup procedure in the Claude plugin distribution.
.claude-plugin/fleet-skills/skills/pr-review-conduct/SKILL.md Mirrors the post-merge cleanup requirement in the Claude plugin distribution.
.claude-plugin/fleet-skills/skills/operational-vs-release-workflow/SKILL.md Mirrors the release/promotion cleanup terminal step in the Claude plugin distribution.
.claude-plugin/fleet-skills/skills/git-commit-conventions/SKILL.md Mirrors the post–squash-merge git branch -D exception in the Claude plugin distribution.
.claude-plugin/fleet-skills/.source-digest Updates the plugin source digest to match the new Skills content.
.agents/skills/repo-worktree/SKILL.md Mirrors the updated repo-worktree cleanup procedure in the agents distribution.
.agents/skills/pr-review-conduct/SKILL.md Mirrors the post-merge cleanup requirement in the agents distribution.
.agents/skills/operational-vs-release-workflow/SKILL.md Mirrors the release/promotion cleanup terminal step in the agents distribution.
.agents/skills/git-commit-conventions/SKILL.md Mirrors the post–squash-merge git branch -D exception in the agents distribution.

💡 Configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@ptr727
ptr727 merged commit 6e79398 into main Aug 20, 2026
8 checks 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.

2 participants