Repository navigation
Resolve conflicts in view switch functionality - #119
Merged
Merged
Conversation
vinceblock99
approved these changes
Jul 21, 2026
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
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 pull request introduces several improvements to the view listing command and enhances the merge engine's ability to resolve multi-way and concurrent insertion conflicts more intelligently. The main changes include a new
--shortoption for concise view listings, improved metadata display, and a more robust semantic merge strategy that deduplicates identical changes and resolves concurrent insertions where possible.View Listing Command Improvements:
--short(-s) option to theatomic view listcommand, allowing users to display only view names without metadata. The default output now includes metadata, and the old--verboseoption is hidden but retained for backward compatibility. [1] [2]Semantic Merge Engine Enhancements:
run_three_waymethod and improved logging for merge outcomes. [1] [2] [3]Repository Metadata:
ViewInfostruct now distinguishes between total change count and the number of changes unique to a view (own_change_count), supporting more informative listings.Output Consistency: