Thanks to visit codestin.com
Credit goes to github.com

Skip to content

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

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

[pre-commit.ci] pre-commit autoupdate#8148
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)
- [github.com/crate-ci/typos: dictgen-v0.3.1 → v1](crate-ci/typos@dictgen-v0.3.1...v1)
@nabobalis nabobalis added No Changelog Entry Needed Skip all changelog checks. Minor Change PR only needs one approval to merge. backport 6.0 labels Apr 7, 2025
@nabobalis nabobalis merged commit 6c20e0e into main Apr 7, 2025
27 of 30 checks passed
@nabobalis nabobalis deleted the pre-commit-ci-update-config branch April 7, 2025 22:09
@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 6.0
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 6c20e0e17373b922743ede3a050f79d667dab0a3
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #8148: [pre-commit.ci] pre-commit autoupdate'
  1. Push to a named branch:
git push YOURFORK 6.0:auto-backport-of-pr-8148-on-6.0
  1. Create a PR against branch 6.0, I would have named this PR:

"Backport PR #8148 on branch 6.0 ([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
meeseeksmachine pushed a commit to meeseeksmachine/sunpy that referenced this pull request Apr 7, 2025
nabobalis added a commit that referenced this pull request Apr 7, 2025
…8-on-6.1

Backport PR #8148 on branch 6.1 ([pre-commit.ci] pre-commit autoupdate)
@nabobalis nabobalis removed the Still Needs Manual Backport This PR needs manually backporting. label Jul 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Minor Change PR only needs one approval to merge. No Changelog Entry Needed Skip all changelog checks.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant