Skip to content

chore: synchronize main release ancestry#49

Merged
Alex-ghost599 merged 3 commits into
developfrom
chore--sync-main-ancestry
Jul 15, 2026
Merged

chore: synchronize main release ancestry#49
Alex-ghost599 merged 3 commits into
developfrom
chore--sync-main-ancestry

Conversation

@Alex-ghost599

Copy link
Copy Markdown
Owner

Problem

The v0.1.0 squash release left main and develop with equivalent release trees but divergent ancestry, causing the reviewed v0.1.1 promotion PR to conflict.

Change

  • ancestry-only merge commit with first parent develop@7ba833d and second parent main@5ad634c
  • commit tree is byte-for-byte identical to develop@7ba833d
  • no tracked file changes

Verification

  • exact parent and tree object assertions passed
  • git diff 7ba833d..11c33b9 is empty
  • independent validation-only plan approval: APPROVE (0 Blocker / 0 Important / 0 Minor)
  • refs were race-guarded before construction

Merge boundary

This PR must use a normal merge once, not squash, so the main parent remains in develop ancestry. Repository merge settings and develop linear-history protection will be restored immediately after the merge attempt. All required checks, PR requirements, force-push/deletion protections, and strict status checks remain active.

Closes #48

Fixes the privacy scanner false negative tracked in #1. Validated by focused regression tests, full CI, dependency review, and independent Agent review.
First public Agent-native release with review-gated execution, verified Feishu Task mutations, safe Agent presentation, and tag-only provenance-aware release automation.
@Alex-ghost599
Alex-ghost599 merged commit 3a54b5c into develop Jul 15, 2026
18 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.

1 participant