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

[main] Revert "Temporary disable anorm example" (backport #418) by @mkurz #783

Merged
merged 5 commits into from
Nov 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 17, 2024

This reverts commit 88e51fd.

After anorm switched to Play 3 / Pekko.


This is an automatic backport of pull request #418 done by Mergify.

@mergify mergify bot added the conflicts label Nov 17, 2024
Copy link
Contributor Author

mergify bot commented Nov 17, 2024

Cherry-pick of 4a2ddb3 has failed:

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

You are currently cherry-picking commit 4a2ddb30.
  (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:   test.sh

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 3e8d9a5 has failed:

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

You are currently cherry-picking commit 3e8d9a59.
  (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:   .github/workflows/build-test.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 7a47b99 has failed:

On branch mergify/bp/main/pr-418
Your branch is ahead of 'origin/main' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 7a47b99f.
  (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:   scala/anorm/build.sbt

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 3c73d08 has failed:

On branch mergify/bp/main/pr-418
Your branch is ahead of 'origin/main' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 3c73d083.
  (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:   scala/anorm/build.sbt

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

This reverts commit 88e51fd.

(cherry picked from commit 4a2ddb3)

# Conflicts:
#	test.sh
(cherry picked from commit 3e8d9a5)

# Conflicts:
#	.github/workflows/build-test.yml
@mkurz mkurz force-pushed the mergify/bp/main/pr-418 branch from e71d713 to fb8fde3 Compare November 17, 2024 09:29
@mkurz mkurz merged commit 807983a into main Nov 17, 2024
42 checks passed
@mergify mergify bot deleted the mergify/bp/main/pr-418 branch November 17, 2024 10:05
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