Skip to content

[pre-commit.ci] pre-commit autoupdate#832

Merged
nabobalis merged 1 commit into
mainfrom
pre-commit-ci-update-config
Apr 7, 2025
Merged

[pre-commit.ci] pre-commit autoupdate#832
nabobalis merged 1 commit into
mainfrom
pre-commit-ci-update-config

Conversation

@pre-commit-ci
Copy link
Copy Markdown
Contributor

@pre-commit-ci pre-commit-ci Bot commented Apr 7, 2025

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.11.2 → v0.11.4](astral-sh/ruff-pre-commit@v0.11.2...v0.11.4)
@nabobalis nabobalis added this to the 2.4.0 milestone Apr 7, 2025
@nabobalis nabobalis added No Changelog Entry Needed Skip all changelog checks. backport 2.3 on-merge: backport to 2.3 labels Apr 7, 2025
@nabobalis nabobalis merged commit 56ac518 into main Apr 7, 2025
20 checks passed
@nabobalis nabobalis deleted the pre-commit-ci-update-config branch April 7, 2025 22:05
@lumberbot-app
Copy link
Copy Markdown

lumberbot-app Bot commented Apr 7, 2025

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 2.3
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 56ac518368dfc8610267414d2d1d1d7bbc81c577
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #832: [pre-commit.ci] pre-commit autoupdate'
  1. Push to a named branch:
git push YOURFORK 2.3:auto-backport-of-pr-832-on-2.3
  1. Create a PR against branch 2.3, I would have named this PR:

"Backport PR #832 on branch 2.3 ([pre-commit.ci] pre-commit autoupdate)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@lumberbot-app lumberbot-app Bot added the Still Needs Manual Backport This PR needs manually backporting. label Apr 7, 2025
nabobalis added a commit that referenced this pull request Jun 12, 2025
[pre-commit.ci] pre-commit autoupdate

(cherry picked from commit 56ac518)
@nabobalis nabobalis removed the Still Needs Manual Backport This PR needs manually backporting. label Jun 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.3 on-merge: backport to 2.3 No Changelog Entry Needed Skip all changelog checks.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant