Refactor merge option a bit#160
Merged
Merged
Conversation
This also fixes esp-rs#159.
jessebraham
approved these changes
Apr 27, 2022
Member
jessebraham
left a comment
jessebraham
left a comment
There was a problem hiding this comment.
Thank you for this! I agree this is more in line with how I would expect it to work.
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.
I think the earlier way the merge option was implemented was a bit surprising to the user and entirely undocumented in that. It created a new file
_mergedinstead of the actual given path name. I think if a user provides--mergewith afile, thatfilebeing the merged file is the expected outcome.This refactors the merge functionality while providing a clear separation in terms of code paths for merged and unmerged paths while being overall less complex and less code to maintain.
This also fixes #159.