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

Adding retry for concurrent merge failed serialization #239

Merged
merged 5 commits into from Mar 24, 2023
Merged

Adding retry for concurrent merge failed serialization #239

merged 5 commits into from Mar 24, 2023

Commits on Mar 23, 2023

  1. cherry-picked original changes

    @b-goyal
    fcapponi authored and b-goyal committed Mar 23, 2023
    Copy the full SHA
    e1259e7 View commit details
    Browse the repository at this point in the history

  2. undhandled exception

    @b-goyal
    fcapponi authored and b-goyal committed Mar 23, 2023
    Copy the full SHA
    d073583 View commit details
    Browse the repository at this point in the history

  3. Update MergeQueries.java

    @FreCap @b-goyal
    FreCap authored and b-goyal committed Mar 23, 2023
    Copy the full SHA
    7a55732 View commit details
    Browse the repository at this point in the history

  4. Update MergeQueries.java

    @FreCap @b-goyal
    FreCap authored and b-goyal committed Mar 23, 2023
    Copy the full SHA
    29c5837 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. resolves merge conflicts with base branch 2.3.x

    @b-goyal
    b-goyal committed Mar 24, 2023
    Copy the full SHA
    b2a1c09 View commit details
    Browse the repository at this point in the history