skills.rest
me2resh
me2reshCOMMUNITY
Explore all skills by this author →
Website𝕏@me2reshGitHub

release-sync

Create a main-to-dev PR with `-X ours` after a squash-merge release.

489|254|Updated Apr 5, 2026
Search Tags:#automation#git#release management#squash merge#pull request workflow#merge conflict reduction#changelog synchronization
One-click install
npx skills add https://github.com/me2resh/apexyard --skill release-sync
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: release-sync
Source: https://github.com/me2resh/apexyard/tree/main/.claude/skills/release-sync
Command: npx skills add https://github.com/me2resh/apexyard --skill release-sync

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

It prevents repeated squash-merge release cycles from accumulating long-lived SHA divergence between main and dev that turns future release PRs into large, conflict-heavy merges.

Core Features & Use Cases

  • Syncs main→dev after each squash-merge release by opening a PR that makes the release squash commit an ancestor of dev, so later diffs contain only genuinely-new changes.
  • Applies safe merge semantics using -X ours so dev content wins on conflicts, which matches the framework’s release model where dev already contains the unsquashed equivalents.
  • Carries forward CHANGELOG.md from main as a separate atomic commit to avoid silently dropping release-notes history caused by -X ours.

Quick Start

Ask the agent to run the sync for version v2.0.3 after the release completes.

Frequently Asked Questions about release-sync

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
Why do repeated squash merges from dev to main cause merge conflicts in future releases?▼

Squash merges create a new single commit on main that dev does not recognize as an ancestor, causing long-lived SHA divergence that turns future release pull requests into large, conflict-heavy merges.

How do I sync main back into dev after a squash-merge release?▼

Open a main-to-dev pull request that merges upstream/main into a dev-based sync branch using `-X ours`, ensuring the release squash commit becomes an ancestor of dev without merging it immediately.

Does the `-X ours` merge strategy affect changelog synchronization during a main to dev sync?▼

Yes, the `-X ours` strategy makes dev content win on conflicts and can silently drop release-notes history, so `CHANGELOG.md` must be carried forward from main as a separate atomic commit.

What do I need to validate before running a main-to-dev release sync?▼

You need to validate the repository scope, upstream branches, and tags, then compute the divergence between main and dev to ensure a safe upstream merge into the sync branch.

Should I merge the main-to-dev sync pull request immediately after opening it?▼

No, the workflow requires opening but not merging the pull request targeted at dev, allowing you to review the divergence resolution before integrating the release squash commit.

Related Skills

Explore More Software Engineering Skills→
indexnetworkindexnetwork
130

sync-branches

Delete local and remote Git branches merged into upstream/dev.

Official
Intermediate
AAbdulghanyAAbdulghany

release-sync

Create a merge PR reconciling main into dev after squash releases.

Community
Advanced
mgd34msumgd34msu
4

git-workflows

Generate pull request descriptions, commit messages, and release notes for Git workflows.

Community
Intermediate
eivindebeivindeb

manual-merge-branches

Merge Git branches with explicit user approval for each conflict resolution.

Community
Advanced