ROX-31829: Implement aggressive conflict resolution#64
Merged
mclasmeier merged 25 commits intomainfrom Nov 25, 2025
Merged
Conversation
mclasmeier
force-pushed
the
mc/no-ssa-4
branch
from
270ea6f to
542ad8a
Compare
mclasmeier
changed the title
porridge
reviewed
Nov 18, 2025
Collaborator
porridge
left a comment
porridge
left a comment
There was a problem hiding this comment.
Looks OK in general, some comments inline.
Also, the custom predicates bit should probably be a separate PR for ease of upstreaming later?
Contributor
Author
|
The |
added 16 commits
November 19, 2025 10:04
updater tests and use Ginkgo assertions instead of production error handling.
mclasmeier
force-pushed
the
mc/no-ssa-4
branch
from
542ad8a to
cc60c7d
Compare
Contributor
Author
|
@porridge Hope I have addressed everything. Thank you! |
porridge
reviewed
Nov 20, 2025
Collaborator
porridge
left a comment
porridge
left a comment
There was a problem hiding this comment.
Some questions and comments inline.
added 6 commits
November 21, 2025 10:24
porridge
approved these changes
Nov 24, 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
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.
Implements a conflict resolution strategy for use in rhacs-operator.
Can be reviewed commit by commit.