skills.rest
Azure
AzureOFFICIAL
Explore all skills by this author →
Website𝕏@AzureGitHub

azsdk-common-patch-mergeback

Prepares merge-back PRs reconciling patch-release version, CHANGELOG, and pom.xml updates into main.

2.6k|2.2k|Updated Dec 6, 2011
Search Tags:#Versioning#azure sdk#merge-back#JAVA#Pull request#ChangeLog#patch release
One-click install
npx skills add https://github.com/Azure/azure-sdk-for-java --skill azsdk-common-patch-mergeback
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: azsdk-common-patch-mergeback
Source: https://github.com/Azure/azure-sdk-for-java/tree/main/.github/skills/azsdk-java-patch-mergeback
Command: npx skills add https://github.com/Azure/azure-sdk-for-java --skill azsdk-common-patch-mergeback

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

Patch releases on release/patch/YYYYMMDD branches revert CHANGELOG.md and version files to the last stable release, so a naive merge into main produces many conflicts. This Skill encodes the exact resolution rules for each file type so the merge-back PR is correct.

Core Features & Use Cases

  • Scoped change detection: Diffs only the last two commits of the release branch to identify touched version_client.txt, CHANGELOG.md, and pom.xml files.
  • Guided file reconciliation: Reference docs define how to merge version_client.txt (take release-branch dependency-version, keep main's current-version) and CHANGELOG.md (insert the patch entry under the Unreleased section).
  • Deterministic pom regeneration: Runs eng/versioning/update_versions.py --skip-readme so pom.xml files are regenerated and READMEs stay untouched.
  • Use Case: After the July 2026 patch release ships, ask the Skill to prepare the merge-back PR for release/patch/20260701 into main, and it produces a correctly reconciled branch ready for review.

Quick Start

Prepare the merge-back PR for release/patch/20260701 into main.

Frequently Asked Questions about azsdk-common-patch-mergeback

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

FAQPage Schema
How do I merge a patch release branch back into main?▼

Create a branch from main, diff the last two commits of the release/patch/YYYYMMDD branch, reconcile version_client.txt and each CHANGELOG.md per the resolution rules, then regenerate pom.xml with update_versions.py --skip-readme and open the PR against main.

How do I resolve version_client.txt conflicts in a patch merge-back?▼

Take the dependency-version from the release branch only for libraries that changed, and always keep the current-version from main. Never reset beta versions to beta.1 or modify unrelated library lines.

Should pom.xml files be edited manually during a merge-back?▼

No, pom.xml files must never be edited by hand. They are regenerated by running python eng/versioning/update_versions.py --skip-readme after version_client.txt is fully correct, and only the generated output is staged.

Why does the patch CHANGELOG entry have wrong dependency from-versions?▼

Release-branch patch entries often copy the from-version from an older release instead of the immediately preceding one. Check the previous release entry in the same CHANGELOG and correct each bullet's from-version to that entry's recorded to-version.

When should this merge-back workflow not be used?▼

Do not use it for triggering SDK releases, incrementing versions for a new patch cycle, or code generation. It only covers reconciling an existing release/patch branch's version, CHANGELOG, and pom.xml updates back into main.

Related Skills

Explore More Software Engineering Skills→
ant-designant-design
99.3k

antd-version-release

Prepare release PRs and publish npm versions for the ant-design repository.

Official
Intermediate
jeremy-newhousejeremy-newhouse

wa:validate-merge

Validate PR approval and CI checks, then merge into the target branch.

Community
Intermediate
sakamoto-family-smilesakamoto-family-smile

verification-loop

Automate end-to-end verification of Claude Code sessions with build, type, lint, test, security, and diff checks.

Community
Advanced
MoonLadderStudiosMoonLadderStudios
12

fix-merge-conflicts

Fetch origin/main, merge into the current branch, resolve conflicts, and push.

Official
Intermediate