fix: merge-train/fairies should merge from v4 not next#20728
Draft
fix: merge-train/fairies should merge from v4 not next#20728
Conversation
- Remove merge-train/fairies from the next-to-branches sync matrix - Add merge-train-v4-to-branches.yml to sync v4 into merge-train/fairies - Update merge-train-create-pr.yml to target v4 for merge-train/fairies, including ancestor check and PR body README link - Generalize merge-next.sh to accept an optional source branch argument (defaults to next) so it can merge from v4 - Update SKILL.md docs to reflect the fairies v4 exception
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
1 participant
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.
Configures merge-train/fairies to target and merge from the v4 branch instead of next. This ensures the correct base branch is used for this specific merge train and prevents incorrect merges to the next branch. The change aligns merge behavior with v4 release requirements.