SO-4901: identical component conflict #1160
Merged
Conversation
This file contains 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
...use cases 1. added vs added with same object key and values (should not be reported as conflict) 2. added vs added with same object key but different values (still conflict)
...there is only one present on each side of the merge
...added vs added conflict is detected and ensure we only report conflict for objects with different properties
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## 8.x #1160 +/- ##
============================================
- Coverage 64.07% 64.05% -0.02%
- Complexity 12771 12778 +7
============================================
Files 1763 1763
Lines 59596 59628 +32
Branches 5496 5508 +12
============================================
+ Hits 38184 38197 +13
- Misses 19042 19058 +16
- Partials 2370 2373 +3
☔ View full report in Codecov by Sentry. |
cmark
added
the
port-to-7.x
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 PR improves the automatic conflict resolution to allow identical objects to be added to both sides of the merge. This earlier resulted in a conflict now it passes through.