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

Update Magnolia to 1.3.1 (Scala 3) #2930

Merged
merged 1 commit into from
Jun 7, 2023
Merged

Conversation

kciesielski
Copy link
Member

No description provided.

@kciesielski
Copy link
Member Author

Blocked by #2924

@kciesielski
Copy link
Member Author

@Mergifyio rebase

@mergify
Copy link
Contributor

mergify bot commented Jun 7, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/2)
Rebasing (2/2)
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git rebase --skip'
interactive rebase in progress; onto b18fa1e0f
Last commands done (2 commands done):
   pick 35643b51c Update Magnolia to 1.3.1 (Scala 3)
   pick de50857cc Update Scala to 3.3.0
No commands remaining.
You are currently rebasing branch 'update/magnolia-1.3.1' on 'b18fa1e0f'.
  (all conflicts fixed: run "git rebase --continue")

nothing to commit, working tree clean
Could not apply de50857cc... Update Scala to 3.3.0

err-code: 422D8

@kciesielski kciesielski force-pushed the update/magnolia-1.3.1 branch from 676be23 to 3df2542 Compare June 7, 2023 07:19
@kciesielski kciesielski marked this pull request as ready for review June 7, 2023 07:21
@kciesielski kciesielski merged commit b680327 into master Jun 7, 2023
@mergify mergify bot deleted the update/magnolia-1.3.1 branch June 7, 2023 08:10
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