Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 24, 2025


This is an automatic backport of pull request #91 done by [Mergify](https://mergify.com).

(cherry picked from commit 6407ee2)

# Conflicts:
#	Dockerfile
@mergify mergify bot added the conflicts label Feb 24, 2025
Copy link
Author

mergify bot commented Feb 24, 2025

Cherry-pick of 6407ee2 has failed:

On branch mergify/bp/release_2.2/pr-91
Your branch is up to date with 'origin/release_2.2'.

You are currently cherry-picking commit 6407ee2.
  (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:   Dockerfile

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

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