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

Keep getting merge conflicts #22

Closed
redkhalil opened this issue Apr 16, 2023 · 1 comment
Closed

Keep getting merge conflicts #22

redkhalil opened this issue Apr 16, 2023 · 1 comment

Comments

@redkhalil
Copy link

redkhalil commented Apr 16, 2023

When combining the dependabot PRs, keep getting merge conflicts, and the workflow is only able to pick one PR... I've observed this on many projects. However when updating library dependencies, the workflow works fine. So I'm getting this issue only on dependabot PRs.

image

I've added some logging, log for another run below

Run actions/github-script@v6
Pull for branch: update/sbt-wartremover-3.0.14
Pull for branch: update/scalafmt-core-3.7.3
Pull for branch: dependabot/github_actions/actions/setup-java-3.11.0
Branch matched prefix: dependabot/github_actions/actions/setup-java-3.11.0
Checking green status: dependabot/github_actions/actions/setup-java-3.11.0
Validating status: SUCCESS
Checking labels: dependabot/github_actions/actions/setup-java-3.11.0
Checking label: dependencies
Adding branch to array: dependabot/github_actions/actions/setup-java-3.11.0
Pull for branch: dependabot/github_actions/actions/checkout-3.5.0
Branch matched prefix: dependabot/github_actions/actions/checkout-3.5.0
Checking green status: dependabot/github_actions/actions/checkout-3.5.0
Validating status: SUCCESS
Checking labels: dependabot/github_actions/actions/checkout-3.5.0
Checking label: dependencies
Adding branch to array: dependabot/github_actions/actions/checkout-3.5.0
Pull for branch: update/sbt-wartremover-3.0.13
Pull for branch: update/mockito-scala-1.17.14
Pull for branch: update/logback-classic-1.4.6
Merged branch dependabot/github_actions/actions/setup-java-3.11.0
Failed to merge branch dependabot/github_actions/actions/checkout-3.5.0
ERROR: HttpError: refusing to allow a GitHub App to create or update workflow `.github/workflows/pull-request.yml` without `workflows` permission
Creating combined PR
@redkhalil
Copy link
Author

redkhalil commented Apr 16, 2023

Workflow requires a classic token with permissions: repo, workflow.
Might help to indicate that.

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

No branches or pull requests

1 participant