Allow passing merge options to merge #1192
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
rohitsanj
commented
Feb 19, 2023
jdavid
requested changes
Feb 20, 2023
|
Looks good, do you think you could add unit tests for the options? |
|
Sure, I can add unit tests. I was confident about the functionality of the merge options passthrough in this implementation since the |
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 reimplements the
mergemethod using cffi and removes the C implementation.In addition, the
mergemethod will now accept additional argumentsfavor,flagsandfile_flagsto have more control over merge options.The existing merge tests pass. I'm not sure what other cases need to be tested.