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

Make dry run merge / transplant throw exceptions #6685

Merged
merged 2 commits into from
Apr 25, 2023
Merged

Make dry run merge / transplant throw exceptions #6685

merged 2 commits into from
Apr 25, 2023

Commits on Apr 25, 2023

  1. Make dry run merge / transplant throw exceptions 

    The `dryRun` API parameter is different from `returnConflictAsResult`.

If a dry run is requested it should produce the same client-side effect
as a normal merge / transplant.

At the `VersionStore` level this means throwing the same exception
regardless of the `dryRun` parameter because `returnConflictAsResult`
does not exist at that level.
    @dimas-b
    dimas-b committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    fd56031 View commit details
    Browse the repository at this point in the history

  2. fix mergeKeyBehaviorValidation

    @dimas-b
    dimas-b committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    d282e42 View commit details
    Browse the repository at this point in the history