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 over-eager merging of fields which have differing directive applications #2713

Merged
merged 7 commits into from
Aug 3, 2023
Merged

Prevent over-eager merging of fields which have differing directive applications #2713

merged 7 commits into from
Aug 3, 2023

Commits on Aug 2, 2023

  1. reproduction / test cases

    @trevor-scheer
    trevor-scheer committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    fed6600 View commit details
    Browse the repository at this point in the history

  2. apply fix, add more test cases

    @trevor-scheer
    trevor-scheer committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    419faad View commit details
    Browse the repository at this point in the history

  3. add unit test

    @trevor-scheer
    trevor-scheer committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    972ecd2 View commit details
    Browse the repository at this point in the history

  4. revert extraneous change

    @trevor-scheer
    trevor-scheer committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    6c2835e View commit details
    Browse the repository at this point in the history

  5. changeset

    @trevor-scheer
    trevor-scheer committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    442e10f View commit details
    Browse the repository at this point in the history

  6. use toMatchString()

    @trevor-scheer
    trevor-scheer committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    993df58 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into trevor/fix-2712

    @trevor-scheer
    trevor-scheer authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    80c8d22 View commit details
    Browse the repository at this point in the history