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.7.x] Make sure Sonatype plugin does not override Common settings (backport #621) by @mkurz #622

Merged
merged 1 commit into from
Nov 5, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 5, 2024

Copy link
Author

mergify bot commented Nov 5, 2024

Cherry-pick of a8ec4dc has failed:

On branch mergify/bp/2.7.x/pr-621
Your branch is up to date with 'origin/2.7.x'.

You are currently cherry-picking commit a8ec4dc.
  (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/Common.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

(cherry picked from commit a8ec4dc)

# Conflicts:
#	project/Common.scala
@mkurz mkurz force-pushed the mergify/bp/2.7.x/pr-621 branch from a94ed56 to d0bb0f1 Compare November 5, 2024 12:16
@mkurz mkurz merged commit 6efa213 into 2.7.x Nov 5, 2024
1 of 2 checks passed
@mkurz mkurz deleted the mergify/bp/2.7.x/pr-621 branch November 5, 2024 12:16
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