[dependabot]

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.

• Skip commits the target branch already contains by @​lexfrei in korthout/backport-action#705

New Contributors

• @​lexfrei made their first contribution in korthout/backport-action#705

Updated dependencies

• Update korthout/backport-action action to v4.6.1 by @​renovate[bot] in korthout/backport-action#718
• Update dependency prettier to v3.9.9 by @​renovate[bot] in korthout/backport-action#720
• Lock file maintenance by @​renovate[bot] in korthout/backport-action#721

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

[tdonohue]

@dependabot rebase

[tdonohue]

👍 CI processes all still work with this update. Looks good.