Disable merge-up from release/1.17 #2202
Merged
+0 −37
Conversation
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
There was a problem hiding this comment.
Pull Request Overview
This PR disables the automatic merge-up workflow from release/1.17 to prevent merge conflicts that occur when commits on 1.17 don't apply cleanly to 2.x branches. The workflow will be replaced with manual cherry-picking of individual changes as needed.
- Removes the entire merge-up GitHub Actions workflow
- Eliminates automatic pull request creation for version merges
- Shifts to manual cherry-picking approach for cross-version changes
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
API Change ReportNo changes found! |
This was referenced Oct 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants
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.
Since commits on 1.17 often don't apply cleanly to 2.x, we disable the merge-up flow from 1.17. Instead, we'll be cherry-picking individual changes to 1.17 if they apply there as well.