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

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

Merged
merged 1 commit into from
Feb 6, 2024

Conversation

pre-commit-ci[bot]
Copy link
Contributor

@pre-commit-ci pre-commit-ci bot commented Feb 5, 2024

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.1.14 → v0.2.0](astral-sh/ruff-pre-commit@v0.1.14...v0.2.0)
@flying-sheep flying-sheep added this to the 1.9.9 milestone Feb 6, 2024
@flying-sheep flying-sheep merged commit 585f58c into master Feb 6, 2024
10 of 14 checks passed
@flying-sheep flying-sheep deleted the pre-commit-ci-update-config branch February 6, 2024 09:08
Copy link

lumberbot-app bot commented Feb 6, 2024

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 1.9.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 585f58c9e4dd82dd7809a831538c4e230b008818
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #2841: [pre-commit.ci] pre-commit autoupdate'
  1. Push to a named branch:
git push YOURFORK 1.9.x:auto-backport-of-pr-2841-on-1.9.x
  1. Create a PR against branch 1.9.x, I would have named this PR:

"Backport PR #2841 on branch 1.9.x ([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.

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.

1 participant