Don't show file in both "winning" and "losing"#18
Open
oBusk wants to merge 1 commit into
Open
Conversation
When three or more archives contain the same file, the middle archive could end up with that file in both its `wins` and `loses` lists. This happened because the reverse-iteration conflict scan would first mark the middle archive as winning (when compared to the earlier archive), then a later iteration would mark it as losing (when superseded by the last archive) without clearing the stale `wins` entry. Now when an archive is marked as losing a file, any previous winning entry for that file is removed, so each file hash only appears in one of the two lists. Co-Authored-By: Claude <noreply@anthropic.com> (cherry picked from commit 3b66bef)
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
1 participant
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.
This happens when 3 archives (or more) edits the same file. The "middle" archive would both win over an lower prio, and lose against a higher prio.
This could be confusing, and especially when an archive has all their files "beaten" by another, as they would not be marked as obsolete.
This PR changes the behaviour to only show "winning" if no other archive wins that file. Each file is only in a single "winning" list.
I undestand the original behaviour is maybe intended, but I think highlighting only files that are actually "winning" would be clearer to users.