Create a merge PR reconciling main into dev after squash releases.
npx skills add https://github.com/AAbdulghany/fms --skill release-sync-aabdulghany
Please help me install this Agent Skill. Skill: release-sync Source: https://github.com/AAbdulghany/fms/tree/main/.claude/skills/release-sync Command: npx skills add https://github.com/AAbdulghany/fms --skill release-sync-aabdulghany
After squash-merge releases, history divergence between main and dev creates conflicts for subsequent PRs. This skill automates reconciliation by creating a framework-guided merge PR that makes the release squash commit an ancestor of dev, preserving history and simplifying future release flows.
Invoke the release-sync operation with a version tag to create the sync PR that reconciles main into dev after the release.
High-intent search queries and answers about installing and using this skill.
Squash-merging a release from dev to main creates a new single commit on main, causing history divergence because dev lacks that squash commit as an ancestor, leading to conflicts in subsequent release PRs.
To sync main into dev, create a sync branch from upstream/dev and merge upstream/main using the -X ours strategy to preserve dev content, then open a merge PR against dev to make the release commit an ancestor.
Automating release reconciliation involves running pre-flight checks to verify tags and branches, creating a true merge PR with an -X ours merge strategy, and optionally carrying forward CHANGELOG.md to maintain release notes history.
This workflow applies specifically to ApexYard framework repositories where releases are squash-merged from dev to main, enforcing framework-only governance and pre-flight checks to verify repository identity before proceeding.
The sync operation is idempotent, meaning it detects already-synced repositories and performs a no-op, ensuring safe re-runs without creating duplicate merge PRs or altering git history unnecessarily.
The CHANGELOG.md is optionally carried forward from main as a separate commit during the merge reconciliation, ensuring release notes history is maintained independently of the -X ours merge strategy preserving dev content.
INNERJOINTAutomate version bumps, tests, npm publishing, and GitHub releases.
me2reshCut an apexyard framework release with semver bump, CHANGELOG, and release PR.
makyua-sanAutomates Git-based PR merge, CI wait, production deploy, and canary health checks.
bmsull560Resolves git rebase conflicts in feature branches via guided marker resolution.
