Closed pre-commit-ci[bot] closed 1 week ago
Owee, I'm MrMeeseeks, Look at me.
There seem to be a conflict, please backport manually. Here are approximate instructions:
git checkout 1.2.x
git pull
Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 28dd2fbfd956d071e138d7f44bfa5bc0aa720890
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'
git push YOURFORK 1.2.x:auto-backport-of-pr-2841-on-1.2.x
"Backport PR #2841 on branch 1.2.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.
updates: