Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[master] chore: override dependencies waiting the BOM is up to date #5397

Merged
merged 1 commit into from
Jan 21, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 21, 2025

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



Cherry-pick of 829d3d9 has failed:

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

You are currently cherry-picking commit 829d3d97f.
  (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

@mergify mergify bot requested a review from a team as a code owner January 21, 2025 08:25
@mergify mergify bot added the conflicts label Jan 21, 2025
Copy link
Contributor Author

mergify bot commented Jan 21, 2025

Cherry-pick of 829d3d9 has failed:

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

You are currently cherry-picking commit 829d3d97f.
  (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

@leleueri leleueri force-pushed the mergify/bp/master/pr-5393 branch from e3af799 to 0dedf55 Compare January 21, 2025 09:37
@leleueri leleueri merged commit bd589c4 into master Jan 21, 2025
19 of 20 checks passed
@leleueri leleueri deleted the mergify/bp/master/pr-5393 branch January 21, 2025 13:06
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.

1 participant