Repository navigation
Handle merge conflicts in release-sync workflow - #843
Merged
Merged
Conversation
- Add conflict detection and handling - Create PR even when conflicts exist with warning message - Commit conflict markers for manual resolution - Prevent workflow failure on version conflicts
|
ctw-joao-luis
approved these changes
Dec 17, 2025
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.
User-Facing Changes
This PR introduces conflict detection and handling in the release-sync workflow, allowing for the creation of pull requests even when merge conflicts exist.
Description
This update enhances the release-sync workflow by adding conflict detection and handling. It commits conflict markers for manual resolution and prevents workflow failure on version conflicts.
Checklist