[feat] Implement fallback for move and delete conflicts#128
Merged
Conversation
Codecov Report
@@ Coverage Diff @@
## master #128 +/- ##
============================================
+ Coverage 79.31% 80.22% +0.90%
- Complexity 433 443 +10
============================================
Files 36 36
Lines 1576 1623 +47
Branches 242 243 +1
============================================
+ Hits 1250 1302 +52
Misses 208 208
+ Partials 118 113 -5
Continue to review full report at Codecov.
|
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.
Implements a local fallback for move and delete conflicts by performing a line-based merge on the parent whose child list can't be recovered.
Fix #127