Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 8, 2025

(cherry picked from commit e2f5b13)

# Conflicts:
#	app/app.go
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner July 8, 2025 19:49
@mergify mergify bot added the conflicts label Jul 8, 2025
@mergify mergify bot requested a review from a team as a code owner July 8, 2025 19:49
@mergify mergify bot assigned vladjdk Jul 8, 2025
@mergify mergify bot added the conflicts label Jul 8, 2025
Copy link
Contributor Author

mergify bot commented Jul 8, 2025

Cherry-pick of e2f5b13 has failed:

On branch mergify/bp/release/v25.x/pr-3827
Your branch is up to date with 'origin/release/v25.x'.

You are currently cherry-picking commit e2f5b13.
  (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:   CHANGELOG.md
	new file:   app/upgrades/v25_1_0/constants.go
	new file:   app/upgrades/v25_1_0/upgrades.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   app/app.go
	both modified:   go.mod
	both modified:   go.sum

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

@vladjdk vladjdk merged commit 070fe2f into release/v25.x Jul 8, 2025
12 of 13 checks passed
@vladjdk vladjdk deleted the mergify/bp/release/v25.x/pr-3827 branch July 8, 2025 19:54
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.

1 participant