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

[2.9.x] Update changed assets in subprojects (backport #12721) by @mkurz #12725

Merged
merged 2 commits into from
Jun 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 10, 2024

@mergify mergify bot added the conflicts label Jun 10, 2024
Copy link
Contributor Author

mergify bot commented Jun 10, 2024

Cherry-pick of 6b295a3 has failed:

On branch mergify/bp/2.9.x/pr-12721
Your branch is ahead of 'origin/2.9.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 6b295a3dd7.
  (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:   project/Dependencies.scala

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

Contains webjars/webjars-locator-core#159
to fix #12484

(cherry picked from commit 6b295a3)

# Conflicts:
#	project/Dependencies.scala
@mkurz mkurz force-pushed the mergify/bp/2.9.x/pr-12721 branch from ba0d831 to 1404e63 Compare June 10, 2024 10:25
@mergify mergify bot merged commit edcad83 into 2.9.x Jun 10, 2024
27 checks passed
@mergify mergify bot deleted the mergify/bp/2.9.x/pr-12721 branch June 10, 2024 10:51
@mkurz mkurz added this to the 2.9.4 milestone Jun 17, 2024
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.

None yet

1 participant