[renovate]

This PR contains the following updates:

Package	Type	Update	Change
korthout/backport-action	action	patch	v4.7.0 → v4.7.1

---

Release Notes

korthout/backport-action

v4.7.1: Backport-action v4.7.1

Compare Source

What's Changed

Thanks to a contribution by @​jrasm91, backports no longer fail when you combine auto_merge_enabled: true with experimental.conflict_resolution: draft_commit_conflicts. Previously, when a cherry-pick conflicted, the action created the draft backport pull request and then tried to enable auto-merge on it. GitHub doesn't allow auto-merging of drafts, so the backport was reported as an unexpected failure, was_successful was false, and the draft backport pull request didn't receive instructions on how to resolve the conflict.

Now the action doesn't attempt auto-merge on a draft backport pull request and logs it. The backport is reported as drafted with conflicts, and the draft receives the conflict-resolution instructions as usual. With comment_style: summary, that looks like this:

Target	Status
stable/8.7	⚠️ Drafted with conflicts #​612

Auto-merge stays off for the draft. You can enable it once you've resolved the conflicts.

• Skip auto-merge for draft backport pull requests by @​jrasm91 in #​793

New Contributors

• @​jrasm91 made their first contribution in #​793

Updated dependencies

• Update dependency vitest to v5.0.2 by @​renovate[bot] in #​722
• Update korthout/backport-action action to v4.7.0 by @​renovate[bot] in #​723
• Update dependency @​types/node to v24.19.0 by @​renovate[bot] in #​724
• Update dependency vitest to v5.0.3 by @​renovate[bot] in #​728
• Update dependency @​types/node to v24.19.1 by @​renovate[bot] in #​729
• Lock file maintenance by @​renovate[bot] in #​730
• Lock file maintenance by @​renovate[bot] in #​733
• Update dependency @​types/node to v24.19.2 by @​renovate[bot] in #​734
• Update dependency prettier to v3.9.10 by @​renovate[bot] in #​736
• Update dependency vitest to v5.0.4 by @​renovate[bot] in #​737
• Update dependency vitest to v5.0.5 by @​renovate[bot] in #​738
• Lock file maintenance by @​renovate[bot] in #​739
• Update actions/setup-node action to v7.1.0 by @​renovate[bot] in #​732
• Update madhead/semver-utils action to v5.1.1 by @​renovate[bot] in #​741
• Remove unused @​types/dedent by @​korthout in #​744
• Lock file maintenance by @​renovate[bot] in #​745

Maintenance changes

• Add decision-brief skill for product decisions by @​korthout in #​742
• Record past product decisions as ADRs by @​korthout in #​746
• Define the contract that breaking changes are judged by by @​korthout in #​748
• Group breaking fixes by contract element in a milestone by @​korthout in #​751
• Run backport workflow on merged pull requests by @​korthout in #​761
• Move the next-preview tag of the branch's major by @​korthout in #​764
• Only run our Backport workflow for pull requests to backport by @​korthout in #​779
• Keep Node.js versions in line with the action runtime by @​korthout in #​786

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

---

Configuration

📅 Schedule: (UTC)

• Branch creation
  • At any time (no schedule defined)
• Automerge
  • At any time (no schedule defined)

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.

---

• If you want to rebase/retry this PR, check this box

---

This PR was generated by Mend Renovate. View the repository job log.