Skip to content

docs(changelog): add missing entry for #2136 (backport #2459)#2612

Merged
melekes merged 2 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-2459
Mar 14, 2024
Merged

docs(changelog): add missing entry for #2136 (backport #2459)#2612
melekes merged 2 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-2459

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 14, 2024


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

(cherry picked from commit bbcbad5)

# Conflicts:
#	.changelog/v0.37.5/bug-fixes/2136-fix-state-rollback.md
@mergify mergify bot requested a review from a team as a code owner March 14, 2024 04:02
@mergify mergify bot added the conflicts label Mar 14, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Mar 14, 2024

Cherry-pick of bbcbad5 has failed:

On branch mergify/bp/v0.37.x/pr-2459
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit bbcbad5e9.
  (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)
	added by them:   .changelog/v0.37.5/bug-fixes/2136-fix-state-rollback.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

@melekes melekes merged commit 1fe9231 into v0.37.x Mar 14, 2024
@melekes melekes deleted the mergify/bp/v0.37.x/pr-2459 branch March 14, 2024 04:28
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