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.

Sign up for GitHub

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

Jump to bottom

fix: merge object strings of many types #44

Merged
merged 3 commits into from Aug 16, 2022
Merged

fix: merge object strings of many types #44

merged 3 commits into from Aug 16, 2022

Commits on Aug 16, 2022

  1. fix: ignore empty objects in merge chain

    @danielroe
    danielroe committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    387b088 View commit details
    Browse the repository at this point in the history

  2. fix: merge object strings of many types

    @danielroe
    danielroe committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    57a6f50 View commit details
    Browse the repository at this point in the history

  3. test: add additional interface to make expectation explicit

    @danielroe
    danielroe committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    ac83cf1 View commit details
    Browse the repository at this point in the history