[nexus] fix semantic merge conflict between #10787 and #10801#10860
Merged
Conversation
hawkw
enabled auto-merge (squash)
July 17, 2026 21:04
hawkw
disabled auto-merge
July 17, 2026 21:05
hawkw
enabled auto-merge (squash)
July 17, 2026 21:05
sunshowers
approved these changes
Jul 17, 2026
hawkw
disabled auto-merge
July 17, 2026 21:12
hawkw
enabled auto-merge (squash)
July 17, 2026 21:12
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.
PR #10801 changed one of the arguments to
instance_updater_inherit_lockto be passed as a reference, and #10787 added a new test that calls that function. I branched #10801 frommainprior to #10787 merging, so the&was never added where it needed to be. Hilarity ensues. :(