Skip to content

build(deps): bump korthout/backport-action from 4.6.1 to 4.7.0 - #121

Open
dependabot[bot] wants to merge 1 commit into
mainfrom
dependabot/github_actions/korthout/backport-action-4.7.0
Open

dependabot[bot] wants to merge 1 commit into
mainfrom
dependabot/github_actions/korthout/backport-action-4.7.0

Conversation

@dependabot

@dependabot dependabot Bot commented on behalf of github Oct 5, 2026

Copy link
Copy Markdown
Contributor

Bumps korthout/backport-action from 4.6.1 to 4.7.0.

Release notes

Sourced from korthout/backport-action's releases.

Backport-action v4.7.0

What's Changed

Thanks to a great contribution by @​lexfrei, backports no longer fail when the target branch already contains some of the changes, for example if a specific commit was already manually cherry-picked, or on a re-run. Previously, git reported the empty cherry-pick as a conflict, so the backport failed (or opened a draft PR with conflict_resolution: draft_commit_conflicts).

Now the action skips those commits:

  • Some commits already on the target: the backport PR is created as usual. The comment on the original pull request mentions the skipped commits, and a comment on the backport PR lists them.
  • All commits already on the target: there's nothing to backport, so no PR is created. The target is skipped, just like when its backport PR already exists, and doesn't count as a failure in was_successful.

With comment_style: summary, that looks like this:

Target Status
stable/8.7 ✅ Created #612 — 1 commit skipped (target already contains changes)
stable/8.6 ➖ Skipped (target already contains changes)

No configuration needed to enable this. This is a bug fix released in a new minor version to avoid surprising users with new behavior.

New Contributors

Updated dependencies

Full Changelog: korthout/backport-action@v4.6.1...v4.7.0

Commits
  • 8560fb5 dist: release 4.7.0
  • ed61f3e dist: build new artifacts
  • ab5a1f2 Merge pull request #721 from korthout/renovate/lock-file-maintenance
  • 589f023 Lock file maintenance
  • 0bf77c7 Merge pull request #720 from korthout/renovate/prettier-3.x
  • 07bacb3 Update dependency prettier to v3.9.9
  • 04a4bac dist: build new artifacts
  • 09d3c41 Merge pull request #705 from lexfrei/fix/empty-cherry-pick
  • 15cff37 Add skipped commit to the glossary
  • 54c8afc Reword the skipped-commits comment on the backport PR
  • Additional commits viewable in compare view

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 [korthout/backport-action](https://github.com/korthout/backport-action) from 4.6.1 to 4.7.0.
- [Release notes](https://github.com/korthout/backport-action/releases)
- [Commits](korthout/backport-action@v4.6.1...v4.7.0)

---
updated-dependencies:
- dependency-name: korthout/backport-action
  dependency-version: 4.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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 Oct 5, 2026
@cursor

cursor Bot commented Oct 5, 2026 •

Copy link
Copy Markdown

PR Summary

Low Risk
CI-only dependency bump with improved resilience on re-runs and partially cherry-picked targets; no application or auth logic changes.

Overview
Bumps korthout/backport-action in the Backport workflow from v4.6.1 to v4.7.0 (single line in .github/workflows/backport.yml).

v4.7.0 changes backport behavior when the target branch already has some commits: those commits are skipped instead of treating an empty cherry-pick as a conflict (which could fail the job or leave a draft PR under conflict_resolution: draft_commit_conflicts). If every commit is already on the target, no backport PR is created and that target is skipped without counting as a failure.

Reviewed by Cursor Bugbot for commit 3322469. Bugbot is set up for automated code reviews on this repo. Configure here.

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This Dependabot PR bumps korthout/backport-action from v4.6.1 to v4.7.0, a minor release. It fixes empty cherry-picks: commits the target branch already contains are now skipped instead of being reported as conflicts. No inputs change, and it is safe to merge.

Findings: 0 blocking | 1 non-blocking | 0 posted inline

Blockers

  • None at the file/PR level.

Non-blocking

  • None at the file/PR level.
  • 1 non-blocking pre-existing issue(s) listed below under pre-existing issues.

Pre-existing issues

  • [suggestion] .github/workflows/backport.yml pins third-party actions such as korthout/backport-action to a mutable version tag rather than a commit SHA. The action runs with a generated app token that can write, so pinning to a full SHA (e.g. 8560fb503c275d433c56f05a2f64850093baa9f7 for v4.7.0) would reduce supply-chain risk.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants