Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix optional keys and type override in Merge type #456

Merged
merged 5 commits into from
Sep 1, 2022

Conversation

skarab42
Copy link
Collaborator

@skarab42 skarab42 commented Sep 1, 2022

This PR fixes two things, the first is the optional keys which were not handled correctly and the second is the fact that two properties with two different types could not be overwritten.

@sindresorhus sindresorhus merged commit 2e443e2 into sindresorhus:main Sep 1, 2022
@skarab42 skarab42 deleted the fix-merge branch September 1, 2022 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants