Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 31, 2025

Update version numbers for the new release.


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

@mergify mergify bot added the conflicts label Aug 31, 2025
Copy link
Contributor Author

mergify bot commented Aug 31, 2025

Cherry-pick of 7465595 has failed:

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

You are currently cherry-picking commit 7465595b.
  (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:   CMakeLists.txt
	both modified:   SECURITY.md
	both modified:   doc/ChangeLog
	both modified:   meson.build

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

@mergify mergify bot added the conflicts label Aug 31, 2025
@kevinbackhouse kevinbackhouse force-pushed the mergify/bp/main/pr-3380 branch from 7c9f4b2 to ca8a1dd Compare August 31, 2025 09:20
@kevinbackhouse kevinbackhouse marked this pull request as draft August 31, 2025 09:20
@kevinbackhouse kevinbackhouse marked this pull request as ready for review August 31, 2025 13:27
@kevinbackhouse kevinbackhouse force-pushed the mergify/bp/main/pr-3380 branch from ca8a1dd to 2c66b1a Compare August 31, 2025 13:40
@kmilos kmilos merged commit 7671300 into main Sep 1, 2025
75 checks passed
@mergify mergify bot deleted the mergify/bp/main/pr-3380 branch September 1, 2025 07:12
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