Skip to content

[master] chore: update upgrade magic link and SAML idp plugin for 4.11.0#7646

Open
mergify[bot] wants to merge 1 commit into
masterfrom
mergify/bp/master/pr-7640
Open

[master] chore: update upgrade magic link and SAML idp plugin for 4.11.0#7646
mergify[bot] wants to merge 1 commit into
masterfrom
mergify/bp/master/pr-7640

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Apr 3, 2026

This is an automatic copy of pull request #7640 done by Mergify.



Cherry-pick of d1c61a6 has failed:

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

You are currently cherry-picking commit d1c61a674.
  (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:   pom.xml

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

(cherry picked from commit d1c61a6)

# Conflicts:
#	pom.xml
@mergify mergify Bot added the conflicts label Apr 3, 2026
@mergify mergify Bot requested a review from a team as a code owner April 3, 2026 14:45
@mergify mergify Bot added the conflicts label Apr 3, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Apr 3, 2026

Cherry-pick of d1c61a6 has failed:

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

You are currently cherry-picking commit d1c61a674.
  (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:   pom.xml

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

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