Repository navigation
Conversation
SolveConflict now uses ModifyIntervals instead of individual AddInterval/RemoveInterval calls, ensuring atomic updates. - Add computeNetDiff helper to remove common entries from added/removed (intermediate results from conflict resolution algorithm) - Switch error wrapping to %w for proper error chains - Add tests with recordingStorage mock to verify ModifyIntervals usage
Contributor
Author
|
restoring, deletion was unintended. |
Contributor
Author
|
Thanks for merging the others. Is there any work necessary on this one? |
Member
|
Sorry for the late reply, as this is a slightly larger change, I haven't had the time to fully review and test the changes, I'll do my best to do that when I have the time :) |
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.
SolveConflict now uses ModifyIntervals instead of individual AddInterval/RemoveInterval calls, ensuring atomic updates.