Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 25, 2025

Based out of #5346


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

Signed-off-by: Michael Carlstrom <rmc@carlstrom.com>
(cherry picked from commit 24d245c)

# Conflicts:
#	source/Releases/Release-Kilted-Kaiju.rst
@mergify mergify bot added the conflicts label Apr 25, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Apr 25, 2025

Cherry-pick of 24d245c has failed:

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

You are currently cherry-picking commit 24d245c.
  (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:   source/Releases/Release-Kilted-Kaiju.rst

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

@christophebedard
Copy link
Member

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Apr 25, 2025

rebase

☑️ Nothing to do

Details
  • -conflict [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • queue-position = -1 [📌 rebase requirement]
  • any of:
    • #commits-behind > 0 [📌 rebase requirement]
    • #commits > 1 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]

@christophebedard
Copy link
Member

@Mergifyio recreate

@mergify
Copy link
Contributor Author

mergify bot commented Apr 25, 2025

recreate

❌ Sorry but I didn't understand the command. Please consult the commands documentation 📚.

@christophebedard
Copy link
Member

@Mergifyio update

@mergify
Copy link
Contributor Author

mergify bot commented Apr 25, 2025

update

☑️ Nothing to do

Details
  • -conflict [📌 update requirement]
  • #commits-behind > 0 [📌 update requirement]
  • -closed [📌 update requirement]
  • queue-position = -1 [📌 update requirement]

@christophebedard
Copy link
Member

This backports a PR which was a follow-up to another PR. I didn't backport that other PR, so we're getting conflicts here. I'll just close these backport PRs and re-create them, since it seems like I can't do that using commands here.

@christophebedard
Copy link
Member

Oh well, Mergify doesn't want to re-create the backport PRs.

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.

2 participants