Fix three-way-merge to be field-sensitive with --vsd-structs every-field#8805
Open
tautschnig wants to merge 1 commit intodiffblue:developfrom
Open
Fix three-way-merge to be field-sensitive with --vsd-structs every-field#8805tautschnig wants to merge 1 commit intodiffblue:developfrom
tautschnig wants to merge 1 commit intodiffblue:developfrom
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #8805 +/- ##
========================================
Coverage 80.00% 80.01%
========================================
Files 1700 1700
Lines 188249 188285 +36
Branches 73 73
========================================
+ Hits 150615 150649 +34
- Misses 37634 37636 +2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
For structs with struct-typed fields, merging now recursively descends to identify leaf-level modifications. Array handling uses a conservative approach (marking entire array as modified) since enumerating all indices is not practical. Co-authored-by: Kiro autonomous agent Fixes: diffblue#6272
459076c to
a4f1655
Compare
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.
For structs with struct-typed fields, merging now recursively descends to identify leaf-level modifications. Array handling uses a conservative approach (marking entire array as modified) since enumerating all indices is not practical.
Co-authored-by: Kiro autonomous agent
Fixes: #6272