Skip to content

⬆ Bump eps1lon/actions-label-merge-conflict from 3.0.3 to 3.1.0 in the github-actions group#1993

Merged
svlandeg merged 1 commit into
mainfrom
dependabot/github_actions/github-actions-c86d9b567f
Jun 4, 2026
Merged

⬆ Bump eps1lon/actions-label-merge-conflict from 3.0.3 to 3.1.0 in the github-actions group#1993
svlandeg merged 1 commit into
mainfrom
dependabot/github_actions/github-actions-c86d9b567f

Conversation

@dependabot
Copy link
Copy Markdown
Contributor

@dependabot dependabot Bot commented on behalf of github Jun 4, 2026

Bumps the github-actions group with 1 update: eps1lon/actions-label-merge-conflict.

Updates eps1lon/actions-label-merge-conflict from 3.0.3 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

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 <dependency name> major version will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
  • @dependabot ignore <dependency name> minor version will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
  • @dependabot ignore <dependency name> will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
  • @dependabot unignore <dependency name> will remove all of the ignore conditions of the specified dependency
  • @dependabot unignore <dependency name> <ignore condition> will remove the ignore condition of the specified dependency and ignore conditions

Bumps the github-actions group with 1 update: [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict).


Updates `eps1lon/actions-label-merge-conflict` from 3.0.3 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@1df065e...0273be7)

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

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 internal labels Jun 4, 2026
@svlandeg svlandeg merged commit 923f9f4 into main Jun 4, 2026
42 checks passed
@svlandeg svlandeg deleted the dependabot/github_actions/github-actions-c86d9b567f branch June 4, 2026 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file github_actions Pull requests that update GitHub Actions code internal

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants