Skip to content

.github: Bump eps1lon/actions-label-merge-conflict from 2.0.1 to 3.1.0 - #335

Open
dependabot[bot] wants to merge 1 commit into
masterfrom
dependabot-github_actions-eps1lon-actions-label-merge-conflict-3.1.0
Open

.github: Bump eps1lon/actions-label-merge-conflict from 2.0.1 to 3.1.0#335
dependabot[bot] wants to merge 1 commit into
masterfrom
dependabot-github_actions-eps1lon-actions-label-merge-conflict-3.1.0

Conversation

@dependabot

@dependabot dependabot Bot commented on behalf of github Aug 17, 2026

Copy link
Copy Markdown

Bumps eps1lon/actions-label-merge-conflict from 2.0.1 to 3.1.0.

Release notes

Sourced from eps1lon/actions-label-merge-conflict's releases.

v3.1.0

What's Changed

New Contributors

Full Changelog: eps1lon/actions-label-merge-conflict@v3.0.3...v3.1.0

3.0.3

What's Changed

New Contributors

Full Changelog: eps1lon/actions-label-merge-conflict@v3.0.2...v3.0.3

v3.0.2

What's Changed

Full Changelog: eps1lon/actions-label-merge-conflict@v3.0.1...v3.0.2

3.0.1

What's Changed

New Contributors

Full Changelog: eps1lon/actions-label-merge-conflict@v3.0.0...v3.0.1

v3.0.0

What's Changed

  • Update to node20 (#115)

Full Changelog: eps1lon/actions-label-merge-conflict@v2.1.0...v3.0.0

2.1.0

Changes

... (truncated)

Changelog

Sourced from eps1lon/actions-label-merge-conflict's changelog.

Changelog

3.1.0

  • Update Node.js to 24 (#152)

3.0.3

  • Ensure outputs is populated (#136)

3.0.2

  • Handle error when label is not available (part 2) (#126)

3.0.1

  • Handle error when label is not available (#123)

3.0.0

  • Update to node20 (#115)

2.1.0

2.0.1

2.0.0

  • Only update PRs based off of the branch in the push event Previously we checked every open PR. Since a push to a branch can only create merge conflicts with that branch we can limit the set of checked PRs. This should help repositories with lots of PRs targetting different branches with rate limiting.
  • Only leave comments if the dirtyLabel was added or removed

1.4.0

  • Allow warning only if secrets aren't available (#22 by @​baywet)
  • Remove requirement for removeOnDirtyLabel (#21 by @​baywet)

1.3.0

Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 2.0.1 to 3.1.0.
- [Release notes](https://github.com/eps1lon/actions-label-merge-conflict/releases)
- [Changelog](https://github.com/eps1lon/actions-label-merge-conflict/blob/main/CHANGELOG.md)
- [Commits](eps1lon/actions-label-merge-conflict@b8bf834...0273be7)

---
updated-dependencies:
- dependency-name: eps1lon/actions-label-merge-conflict
  dependency-version: 3.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot Bot added dependencies Pull requests that update a dependency file github_actions Pull requests that update GitHub Actions code labels Aug 17, 2026
@github-actions

Copy link
Copy Markdown

Thank you for your contribution. Since you are not yet a member of the Ceph organization with write permissions on ceph/ceph.git, our CI will not automatically run. Any member of the Ceph organization may label this PR ci-approved to allow Jenkins CI jobs to run.

@github-actions github-actions Bot added the CI label Aug 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CI dependencies Pull requests that update a dependency file github_actions Pull requests that update GitHub Actions code needs-ci-approval

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants