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

Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 26, 2025

PR #1526 moved this to a tox target.


This is an automatic backport of pull request #3188 done by Mergify.

@mergify mergify bot added the conflicts This Pull Request has merge conflicts label Feb 26, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Feb 26, 2025

Cherry-pick of 6769d9f has failed:

On branch mergify/bp/release-v0.24/pr-3188
Your branch is up to date with 'origin/release-v0.24'.

You are currently cherry-picking commit 6769d9f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/mergify.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added CI/CD Affects CI/CD configuration release-branch Pull Request directly to a release branch labels Feb 26, 2025
Commit a2faded moved this to a tox
target.

Signed-off-by: Ken Dreyer <[email protected]>
(cherry picked from commit 6769d9f)

# Conflicts:
#	.github/mergify.yml
@ktdreyer ktdreyer force-pushed the mergify/bp/release-v0.24/pr-3188 branch from 8de2c02 to bcf6ddf Compare February 26, 2025 20:48
@mergify mergify bot added the one-approval PR has one approval from a maintainer label Feb 26, 2025
@mergify mergify bot merged commit df1d546 into release-v0.24 Feb 26, 2025
6 checks passed
@mergify mergify bot removed the one-approval PR has one approval from a maintainer label Feb 26, 2025
@mergify mergify bot deleted the mergify/bp/release-v0.24/pr-3188 branch February 26, 2025 20:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CI/CD Affects CI/CD configuration conflicts This Pull Request has merge conflicts release-branch Pull Request directly to a release branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants