Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 25, 2025

@mergify
Copy link
Contributor Author

mergify bot commented May 25, 2025

Cherry-pick of aaa59a3 has failed:

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

You are currently cherry-picking commit aaa59a3.
  (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:   .github/workflows/humble-binary-build.yml
	modified:   .github/workflows/humble-debian-build.yml
	modified:   .github/workflows/humble-rhel-binary-build.yml
	modified:   .github/workflows/humble-semi-binary-build.yml
	modified:   .github/workflows/humble-source-build.yml
	modified:   .github/workflows/jazzy-binary-build.yml
	modified:   .github/workflows/jazzy-debian-build.yml
	modified:   .github/workflows/jazzy-rhel-binary-build.yml
	modified:   .github/workflows/jazzy-semi-binary-build.yml
	modified:   .github/workflows/jazzy-source-build.yml
	modified:   .github/workflows/rolling-binary-build.yml
	modified:   .github/workflows/rolling-debian-build.yml
	modified:   .github/workflows/rolling-rhel-binary-build.yml
	modified:   .github/workflows/rolling-semi-binary-build.yml
	modified:   .github/workflows/rolling-source-build.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: .github/workflows/prerelease-check.yml

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 the conflicts label May 25, 2025
@christophfroehlich christophfroehlich force-pushed the mergify/bp/humble/pr-2279 branch from 690b7f7 to a614405 Compare May 25, 2025 16:33
@christophfroehlich christophfroehlich merged commit cc286ed into humble May 25, 2025
6 of 8 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-2279 branch May 25, 2025 18:19
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