Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Apr 12, 2025


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

(cherry picked from commit fc9633c)

# Conflicts:
#	README.md
@mergify mergify bot added the conflicts label Apr 12, 2025
@mergify
Copy link
Author

mergify bot commented Apr 12, 2025

Cherry-pick of fc9633c has failed:

On branch mergify/bp/humble/pr-184
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit fc9633c.
  (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:   README.md

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

@christophfroehlich christophfroehlich merged commit 89a81b4 into humble Apr 13, 2025
5 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-184 branch April 13, 2025 07:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants