Automate semantic YAML merge conflict resolution for META.yml (#9117) - #9126
Open
jcscottiii wants to merge 1 commit into
Open
Automate semantic YAML merge conflict resolution for META.yml (#9117)#9126jcscottiii wants to merge 1 commit into
jcscottiii wants to merge 1 commit into
Conversation
When concurrent automated PRs (Gecko sync, wpt.fyi triage) modify the same META.yml file, Git performs line-based text merging and flags conflicts. Introduce tools/resolve_conflicts/main.go to semantically union Stage 2 (ours) and Stage 3 (theirs) YAML metadata links using go.yaml.in/yaml/v4. Add .github/workflows/resolve_conflicts.yml to automatically re-resolve and push clean merge commits to open bot PRs when master advances. Upon resolution, posts an explanatory comment on the PR detailing the merge and providing exact copy-pasteable instructions for reverting or overriding. Part of #9117 TAG=agy CONV=151bab34-ef13-4f42-a878-c25d60599679
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
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.
When concurrent automated PRs (Gecko sync, wpt.fyi triage) modify the same META.yml file, Git performs line-based text merging and flags conflicts. Introduce tools/resolve_conflicts/main.go to semantically union Stage 2 (ours) and Stage 3 (theirs) YAML metadata links using go.yaml.in/yaml/v4.
Add .github/workflows/resolve_conflicts.yml to automatically re-resolve and push clean merge commits to open bot PRs when master advances. Upon resolution, posts an explanatory comment on the PR detailing the merge and providing exact copy-pasteable instructions for reverting or overriding.
Part of #9117
TAG=agy
CONV=151bab34-ef13-4f42-a878-c25d60599679