Fallback to git apply --reject if 3 way merge fails to apply #48
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
|
@timothycrosley can you confirm that this works and resolves #47 ? And if it does can you release the new version? |
If git apply -3 cannot find matching hunks, the entire patch fails to apply silently. In this case, we re-apply the patch with a reject flag which succeeds in an update, but creates *.rej files.
Codecov Report
@@ Coverage Diff @@
## master #48 +/- ##
=========================================
Coverage 100.00% 100.00%
=========================================
Files 10 10
Lines 292 302 +10
=========================================
+ Hits 292 302 +10
Continue to review full report at Codecov.
|
|
Confirmed this worked, great work! |
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.
If git apply -3 cannot find matching hunks, the entire patch fails to
apply silently. In this case, we re-apply the patch with a reject flag
which succeeds in an update, but creates *.rej files.
Fixes #47