Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 4, 2024

Since Iron is now EOL, we will not add any further changes to Iron.


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

Copy link
Author

mergify bot commented Dec 4, 2024

Cherry-pick of 41ee92b has failed:

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

You are currently cherry-picking commit 41ee92b.
  (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)

Changes to be committed:
	modified:   README.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/mergify.yml
	both modified:   ci_status.md

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

@urfeex urfeex force-pushed the mergify/bp/humble/pr-230 branch from e56609b to 488a5ac Compare December 11, 2024 14:05
@urfeex urfeex removed the conflicts label Dec 11, 2024
Since Iron is now EOL, we will not add any further changes to Iron.

(cherry picked from commit 41ee92b)

# Conflicts:
#	.github/mergify.yml
#	ci_status.md
@urfeex urfeex force-pushed the mergify/bp/humble/pr-230 branch from 488a5ac to d12eca5 Compare December 11, 2024 14:07
@urfeex urfeex merged commit 161a13e into humble Dec 11, 2024
6 checks passed
@urfeex urfeex deleted the mergify/bp/humble/pr-230 branch December 11, 2024 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant