QVAC-17994 feat[skiplog]: add sdk-backmerge skill#1862
Merged
opaninakuffo merged 2 commits intoMay 1, 2026
Conversation
simon-iribarren
approved these changes
May 1, 2026
NamelsKing
previously approved these changes
May 1, 2026
NamelsKing
approved these changes
May 1, 2026
Contributor
Author
|
review |
Contributor
Tier-based Approval Status |
Proletter
pushed a commit
that referenced
this pull request
May 24, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Note: be concise and prefer bullet points.
🎯 What problem does this PR solve?
gitflow.md"Keep main aligned": one intorelease-<pkg>-<x.y.z>, and a follow-up backmerge intomaincarrying the version bump + changelog. The follow-up was a manual step, easy to forget.sdk-pr-createdidn't know about release-branch targets, so the flow was: user runs the skill, gets the release PR, then has to remember to open the backmerge PR by hand (with the right cherry-pick base, the[skiplog]tag, the right title format, etc.).📝 How does it solve it?
merge-treesimulation vsupstream/main^{tree}) → branch creation offupstream/main→ cherry-pick (-x) → conflict triage with auto-resolve list (package.jsonversion, aggregatedCHANGELOG.md) → late-no-op re-verify → push → title/body assembly →gh pr create.chore[skiplog|notask]: backmerge …(single bracket, pipe-separated) is the tickless form perscripts/sdk/validator.cjs;chore[skiplog][notask]:is explicitly called out as rejected..cursor/skills/sdk-pr-create/SKILL.mdwith a "Release Target Dual-PR Flow" section: when the just-created PR's base isrelease-<pkg>-<x.y.z>, it auto-chains intosdk-backmergeso both PRs are opened in one run. Includes fail-stop policy on non-trivial cherry-pick conflicts and an--no-backmergeopt-out.🧪 How was it tested?
release-test-sdk-0.9.2ontetherto/qvac). Both PRs were opened in a single chainedsdk-pr-create→sdk-backmergerun, then closed once the flow was confirmed:chore[notask]: release sdk 0.9.2(headchore/sdk-0.9.2-release-prep→ baserelease-test-sdk-0.9.2)chore[skiplog|notask]: backmerge release-test-sdk-0.9.2 — version bump, changelog(headbackmerge/release-test-sdk-0.9.2→ basemain)-xcherry-pick footer preserved on the backmerge commitafb2ab3("cherry picked from commit 74109c9").[skiplog|notask]title format accepted byscripts/sdk/validator.cjs.