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

Return merged Resource on schema conflict #4876

Merged
merged 12 commits into from Feb 5, 2024
Merged

Return merged Resource on schema conflict #4876

merged 12 commits into from Feb 5, 2024

Commits on Jan 31, 2024

  1. Return merged Resource on schema conflict

    @MrAlias
    MrAlias committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    72384fd View commit details
    Browse the repository at this point in the history

  2. Add changes to changelog

    @MrAlias
    MrAlias committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    0239f22 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2024

  1. Doc returned resource to have no schema URL

    @MrAlias
    MrAlias committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    14a73bb View commit details
    Browse the repository at this point in the history

  2. Refactor Merge based on feedback

    @MrAlias
    MrAlias committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    47e7b94 View commit details
    Browse the repository at this point in the history

  3. Add the schema URLs to the returned error

    @MrAlias
    MrAlias committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    9f55256 View commit details
    Browse the repository at this point in the history

  4. Ensure no schema URL when merge conflict on detect

    @MrAlias
    MrAlias committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    9f117ab View commit details
    Browse the repository at this point in the history

  5. Replaced isErr with wantErr in TestNew

    @MrAlias
    MrAlias committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    b9ea2aa View commit details
    Browse the repository at this point in the history

  6. Update sdk/resource/auto_test.go 

    Co-authored-by: Robert Pająk <pellared@hotmail.com>
    @MrAlias @pellared
    MrAlias and pellared committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    edb0343 View commit details
    Browse the repository at this point in the history

  7. Update TestDetect based on feedback

    @MrAlias
    MrAlias committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    b062513 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into rm-res-merge-conflic-err

    @MrAlias
    MrAlias committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    cd62d36 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Merge branch 'main' into rm-res-merge-conflic-err

    @MrAlias
    MrAlias committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    2f74074 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into rm-res-merge-conflic-err

    @MrAlias
    MrAlias committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    0f14b80 View commit details
    Browse the repository at this point in the history