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.

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

v1.14: Detect duplicates in the same insert batch (backport of #32528) #32591

Merged
merged 2 commits into from
Jul 28, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 21, 2023

This is an automatic backport of pull request #32528 done by Mergify.
Cherry-pick of b6927db has failed:

On branch mergify/bp/v1.14/pr-32528
Your branch is up to date with 'origin/v1.14'.

You are currently cherry-picking commit b6927db6a8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   core/src/window_service.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ledger/src/blockstore.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Jul 21, 2023
@codecov
Copy link

codecov bot commented Jul 22, 2023

Codecov Report

Merging #32591 (2527473) into v1.14 (2527473) will not change coverage.
The diff coverage is n/a.

❗ Current head 2527473 differs from pull request most recent head fadd1fc. Consider uploading reports for the commit fadd1fc to get more accurate results

@@           Coverage Diff           @@
##            v1.14   #32591   +/-   ##
=======================================
  Coverage    82.1%    82.1%           
=======================================
  Files         665      665           
  Lines      185432   185432           
=======================================
  Hits       152331   152331           
  Misses      33101    33101           

@mvines
Copy link
Member

mvines commented Jul 24, 2023

Needs a rebase 🙏🏼

@carllin
Copy link
Contributor

carllin commented Jul 25, 2023

waiting on #32594

(cherry picked from commit b6927db)

# Conflicts:
#	ledger/src/blockstore.rs
@carllin carllin force-pushed the mergify/bp/v1.14/pr-32528 branch from 4f17ce0 to eac4701 Compare July 25, 2023 22:15
@carllin carllin force-pushed the mergify/bp/v1.14/pr-32528 branch from eac4701 to fadd1fc Compare July 25, 2023 22:28
@carllin carllin requested a review from AshwinSekar July 27, 2023 04:30
@carllin carllin merged commit d621b94 into v1.14 Jul 28, 2023
@carllin carllin deleted the mergify/bp/v1.14/pr-32528 branch July 28, 2023 19:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants