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

[CI] Fixup backport bot #5517

Merged
merged 1 commit into from
Aug 29, 2024
Merged

[CI] Fixup backport bot #5517

merged 1 commit into from
Aug 29, 2024

Conversation

ggwpez
Copy link
Member

@ggwpez ggwpez commented Aug 29, 2024

Changes:

  • Backport bot should just commit merge conflicts instead of failing.

Backport bot should just commit merge conflicts instead of failing, otherwise it will fail very often.
@ggwpez ggwpez marked this pull request as ready for review August 29, 2024 10:25
@ggwpez ggwpez requested review from a team as code owners August 29, 2024 10:25
@ggwpez ggwpez added the R0-silent Changes should not be mentioned in any release notes label Aug 29, 2024
@paritytech-review-bot paritytech-review-bot bot requested a review from a team August 29, 2024 10:34
@ggwpez ggwpez added this pull request to the merge queue Aug 29, 2024
Merged via the queue into master with commit ba48e4b Aug 29, 2024
270 of 277 checks passed
@ggwpez ggwpez deleted the oty-patch-backport branch August 29, 2024 12:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
R0-silent Changes should not be mentioned in any release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants