fix nexus-lockstep semantic merge conflict, #9037 vs #9063 #9077
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
jgallagher
approved these changes
Sep 24, 2025
jgallagher
added a commit
that referenced
this pull request
Sep 24, 2025
(This also includes #9077 to avoid failing CI.) --------- Co-authored-by: iliana etaoin <iliana@oxide.computer>
leftwo
pushed a commit
that referenced
this pull request
Sep 26, 2025
leftwo
pushed a commit
that referenced
this pull request
Sep 26, 2025
(This also includes #9077 to avoid failing CI.) --------- Co-authored-by: iliana etaoin <iliana@oxide.computer>
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.
No description provided.