Fix semantic merge conflict #1224
Merged
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
How to use the Graphite Merge QueueAdd either label to this PR to merge it via the merge queue:
You must have a Graphite account in order to use the merge queue. Sign up using this link. An organization admin has enabled the Graphite Merge Queue in this repository. Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue. |
fbac
approved these changes
Oct 8, 2025
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.
Fix merge drift by updating
pkg/payerreport/store_test.gotestTestCreateAttestationConcurrencyto callstore.StoreReportwith a two-value return, discarding the first result and capturing the errorUpdate the unit test to match the updated function signature by adjusting the call to
store.StoreReportto handle two return values. The test assigns the first return value to the blank identifier and captures the error as the second value in store_test.go.📍Where to Start
Start with the changes in the
TestCreateAttestationConcurrencytest in store_test.go, focusing on the updated call tostore.StoreReportand its two-value return handling.Macroscope summarized b5e92c3.