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

Prevent mutable structures when merging Immutable objects using mergeDeep #1840

Merged
merged 23 commits into from Sep 13, 2021
Merged

Prevent mutable structures when merging Immutable objects using mergeDeep #1840

merged 23 commits into from Sep 13, 2021

Commits on Sep 8, 2021

  1. Prevent mutable structures when merging Immutable objects

    @Methuselah96
    Methuselah96 committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    11952b6 View commit details
    Browse the repository at this point in the history

  2. Add test for partial conflicts

    @Methuselah96
    Methuselah96 committed Sep 8, 2021
    Configuration menu
    Copy the full SHA
    8e06ea5 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2021

  1. Override values consistently

    @Methuselah96
    Methuselah96 committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    6a30077 View commit details
    Browse the repository at this point in the history

  2. Remove failing test

    @Methuselah96
    Methuselah96 committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    8045f23 View commit details
    Browse the repository at this point in the history

  3. Use Seq to determine whether they are indexed or keyed

    @Methuselah96
    Methuselah96 committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    7591993 View commit details
    Browse the repository at this point in the history

  4. Remove unused import

    @Methuselah96
    Methuselah96 committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    a68ea68 View commit details
    Browse the repository at this point in the history

  5. Simplify wording

    @Methuselah96
    Methuselah96 committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    6ac0924 View commit details
    Browse the repository at this point in the history

  6. Be more strict about mergeability

    @Methuselah96
    Methuselah96 committed Sep 9, 2021
    Configuration menu
    Copy the full SHA
    34ca015 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2021

  1. Update documentation

    @Methuselah96
    Methuselah96 committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    ab51c3e View commit details
    Browse the repository at this point in the history

  2. Change wording

    @Methuselah96
    Methuselah96 committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    48183f1 View commit details
    Browse the repository at this point in the history

  3. Remove isSet check

    @Methuselah96
    Methuselah96 committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    3e9c703 View commit details
    Browse the repository at this point in the history

  4. Remove unused import

    @Methuselah96
    Methuselah96 committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    050dfd0 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2021

  1. Add more test cases

    @Methuselah96
    Methuselah96 committed Sep 12, 2021
    Configuration menu
    Copy the full SHA
    e912a1b View commit details
    Browse the repository at this point in the history

  2. Add more test cases

    @Methuselah96
    Methuselah96 committed Sep 12, 2021
    Configuration menu
    Copy the full SHA
    cbaa071 View commit details
    Browse the repository at this point in the history

  3. Update documentation

    @Methuselah96
    Methuselah96 committed Sep 12, 2021
    Configuration menu
    Copy the full SHA
    25896fa View commit details
    Browse the repository at this point in the history

  4. Update documentation

    @Methuselah96
    Methuselah96 committed Sep 12, 2021
    Configuration menu
    Copy the full SHA
    b526da3 View commit details
    Browse the repository at this point in the history

  5. Update documentation

    @Methuselah96
    Methuselah96 committed Sep 12, 2021
    Configuration menu
    Copy the full SHA
    63f4b80 View commit details
    Browse the repository at this point in the history

  6. Update documentation

    @Methuselah96
    Methuselah96 committed Sep 12, 2021
    Configuration menu
    Copy the full SHA
    1ab0cd9 View commit details
    Browse the repository at this point in the history

  7. Update documentation

    @Methuselah96
    Methuselah96 committed Sep 12, 2021
    Configuration menu
    Copy the full SHA
    31e46bd View commit details
    Browse the repository at this point in the history

  8. Update documentation

    @Methuselah96
    Methuselah96 committed Sep 12, 2021
    Configuration menu
    Copy the full SHA
    6e3be74 View commit details
    Browse the repository at this point in the history

  9. Update documentation

    @Methuselah96
    Methuselah96 committed Sep 12, 2021
    Configuration menu
    Copy the full SHA
    5b43972 View commit details
    Browse the repository at this point in the history

  10. Update documentation

    @Methuselah96
    Methuselah96 committed Sep 12, 2021
    Configuration menu
    Copy the full SHA
    2bd33cb View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2021

  1. Add comments

    @Methuselah96
    Methuselah96 committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    be3e91f View commit details
    Browse the repository at this point in the history