Smarter merge conflict resolution #19
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
Support resolving conflicts when the number of lines on each side of the diff is uneven.
Add a test case for when a dependency is deleted.
Fix handling in the case where a new dependency is added.
Refactor ActionFixture to support using it to test/debug rebasing an existing repository manually.
- Fix the unresolvable conflict test so it is indeed unresolvable now. - Fix bug where if there was two different dependencies on the same line of a conflict, the one with the highest value would be chosen and the lower value would be accidentally removed.
Read the lines out of the array once rather than possibly twice.
martincostello
added
bug
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## main #19 +/- ##
==========================================
- Coverage 82.14% 81.68% -0.46%
==========================================
Files 5 5
Lines 224 273 +49
Branches 59 73 +14
==========================================
+ Hits 184 223 +39
- Misses 31 38 +7
- Partials 9 12 +3
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
- Fetch the PackageVersion or PackageReference once. - Only get the name if the version was parsed.
If a line isn't a dependency, only take the line if it matches the line at the same index on the other side of the conflict.
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.
ActionFixtureto support using it to test/debug rebasing an existing repository manually.