zeebe-io/backport-action (zeebe-io/backport-action)
### [`v3.0.2`](https://togithub.com/korthout/backport-action/releases/tag/v3.0.2): Backport-action v3.0.2
[Compare Source](https://togithub.com/zeebe-io/backport-action/compare/v3.0.1...v3.0.2)
#### Fixed
This release fixes a small bug in the `draft_commit_conflicts` option for the experimental [`conflict_resolution`](https://togithub.com/korthout/backport-action?tab=readme-ov-file#conflict_resolution) feature. When encountering conflicts, the backport pull request is opened in draft mode with the conflicts committed. Instructions are provided to resolve these conflicts locally, but these were incorrect. For more details see [https://github.com/korthout/backport-action/issues/421](https://togithub.com/korthout/backport-action/issues/421).
- Checkout draft branch instead of target in suggestion by [@korthout](https://togithub.com/korthout) in [https://github.com/korthout/backport-action/pull/423](https://togithub.com/korthout/backport-action/pull/423)
**Full Changelog**: https://github.com/korthout/backport-action/compare/v3.0.1...v3.0.2
### [`v3.0.1`](https://togithub.com/korthout/backport-action/releases/tag/v3.0.1): Backport-action v3.0.1
[Compare Source](https://togithub.com/zeebe-io/backport-action/compare/v3.0.0...v3.0.1)
#### Fixed
This release fixes a small bug in the `draft_commit_conflicts` option for the experimental [`conflict_resolution`](https://togithub.com/korthout/backport-action?tab=readme-ov-file#conflict_resolution) feature. When encountering conflicts, the backport pull request is opened in draft mode with the conflicts committed. Instructions are provided to resolve these conflicts locally, but these were incorrect. For more details see [#421](https://togithub.com/zeebe-io/backport-action/issues/421).
- Suggest to fetch and checkout draft pr branch directly by [@korthout](https://togithub.com/korthout) in [https://github.com/korthout/backport-action/pull/422](https://togithub.com/korthout/backport-action/pull/422)
**Full Changelog**: https://github.com/korthout/backport-action/compare/v3.0.0...v3.0.1
### [`v3.0.0`](https://togithub.com/korthout/backport-action/releases/tag/v3.0.0): Backport-action v3.0.0
[Compare Source](https://togithub.com/zeebe-io/backport-action/compare/v2.5.0...v3.0.0)
#### Changed
- \[Breaking] Use merge method to cherry-pick by default by [@korthout](https://togithub.com/korthout) in [https://github.com/korthout/backport-action/pull/420](https://togithub.com/korthout/backport-action/pull/420)
This release changes the default behavior of the action to determine which commits are cherry-picked. While this behavior change doesn't necessarily require changes to your workflow, it warrants a major version bump.
Previously, the action cherry-picked the commits from the pull request. Specifically, those reachable from the pull request's head and not reachable from the pull request's base.
From now on, the action cherry-picks the commits based on the method used to merge the pull request by default.
- For "Squash and merge", the action cherry-picks the squashed commit.
- For "Rebase and merge", the action cherry-picks the rebased commits.
- For "Merged as a merge commit", the action cherry-picks the commits from the pull request.
If you previously used the experimental `detect_merge_method` input, we suggest you remove it from your workflow. This experimental input has been deprecated and replaced by the [`cherry_picking`](https://togithub.com/korthout/backport-action?tab=readme-ov-file#cherry_picking) input.
If you want to return to the previous behavior, you can set the [`cherry_picking`](https://togithub.com/korthout/backport-action?tab=readme-ov-file#cherry_picking) input to `pull_request_head`.
This behavior was previously available via the experimental `detect_merge_method` input, introduced in [https://github.com/korthout/backport-action/pull/399](https://togithub.com/korthout/backport-action/pull/399). Special thanks go out to [@jschmid1](https://togithub.com/jschmid1) for contributing this feature.
#### Added
This release also adds two new experimental features. Special shoutouts to [@tasso94](https://togithub.com/tasso94) and [@vermz99](https://togithub.com/vermz99) for contributing these!
- Allow backporting to a downstream repository by [@tasso94](https://togithub.com/tasso94) in [https://github.com/korthout/backport-action/pull/405](https://togithub.com/korthout/backport-action/pull/405)
With the experimental [`downstream_repo`](https://togithub.com/korthout/backport-action?tab=readme-ov-file#downstream_repo) and [`downstream_owner`](https://togithub.com/korthout/backport-action?tab=readme-ov-file#downstream_owner) inputs, you can backport to a repository other than where the workflow runs. For example, when you use a fork to maintain the previously released versions. You can also see this as backporting to a remote repository, but we felt it was better described as backporting to a downstream repository. The default behavior remains that the action always backports to the repository in which the workflow runs.
- Add `conflict_resolution` input by [@vermz99](https://togithub.com/vermz99) in [https://github.com/korthout/backport-action/pull/417](https://togithub.com/korthout/backport-action/pull/417)
With the experimental [`conflict_resolution`](https://togithub.com/korthout/backport-action?tab=readme-ov-file#conflict_resolution) input, you can now change how the action will handle conflicts during cherry-picking. Set it to `draft_commit_conflicts` to create a draft pull request with the first conflict encountered committed to reduce some of the manual efforts in backporting. The default behavior stays like before and can be configured explicitly as `fail`. In that case, the backport fails when the cherry-pick encounters a conflict.
#### Updated Dependencies
- build(deps): bump undici from 5.28.3 to 5.28.4 by [@dependabot](https://togithub.com/dependabot) in [https://github.com/korthout/backport-action/pull/418](https://togithub.com/korthout/backport-action/pull/418)
- build(deps): bump dedent from 1.5.1 to 1.5.3 by [@dependabot](https://togithub.com/dependabot) in [https://github.com/korthout/backport-action/pull/419](https://togithub.com/korthout/backport-action/pull/419)
#### New Contributors
- [@tasso94](https://togithub.com/tasso94) made their first contribution in [https://github.com/korthout/backport-action/pull/405](https://togithub.com/korthout/backport-action/pull/405)
- [@vermz99](https://togithub.com/vermz99) made their first contribution in [https://github.com/korthout/backport-action/pull/417](https://togithub.com/korthout/backport-action/pull/417)
**Full Changelog**: https://github.com/korthout/backport-action/compare/v2.5.0...v3.0.0
Configuration
📅 Schedule: 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 contains the following updates:
v2.5.0->v3.0.2Release Notes
zeebe-io/backport-action (zeebe-io/backport-action)
### [`v3.0.2`](https://togithub.com/korthout/backport-action/releases/tag/v3.0.2): Backport-action v3.0.2 [Compare Source](https://togithub.com/zeebe-io/backport-action/compare/v3.0.1...v3.0.2) #### Fixed This release fixes a small bug in the `draft_commit_conflicts` option for the experimental [`conflict_resolution`](https://togithub.com/korthout/backport-action?tab=readme-ov-file#conflict_resolution) feature. When encountering conflicts, the backport pull request is opened in draft mode with the conflicts committed. Instructions are provided to resolve these conflicts locally, but these were incorrect. For more details see [https://github.com/korthout/backport-action/issues/421](https://togithub.com/korthout/backport-action/issues/421). - Checkout draft branch instead of target in suggestion by [@korthout](https://togithub.com/korthout) in [https://github.com/korthout/backport-action/pull/423](https://togithub.com/korthout/backport-action/pull/423) **Full Changelog**: https://github.com/korthout/backport-action/compare/v3.0.1...v3.0.2 ### [`v3.0.1`](https://togithub.com/korthout/backport-action/releases/tag/v3.0.1): Backport-action v3.0.1 [Compare Source](https://togithub.com/zeebe-io/backport-action/compare/v3.0.0...v3.0.1) #### Fixed This release fixes a small bug in the `draft_commit_conflicts` option for the experimental [`conflict_resolution`](https://togithub.com/korthout/backport-action?tab=readme-ov-file#conflict_resolution) feature. When encountering conflicts, the backport pull request is opened in draft mode with the conflicts committed. Instructions are provided to resolve these conflicts locally, but these were incorrect. For more details see [#421](https://togithub.com/zeebe-io/backport-action/issues/421). - Suggest to fetch and checkout draft pr branch directly by [@korthout](https://togithub.com/korthout) in [https://github.com/korthout/backport-action/pull/422](https://togithub.com/korthout/backport-action/pull/422) **Full Changelog**: https://github.com/korthout/backport-action/compare/v3.0.0...v3.0.1 ### [`v3.0.0`](https://togithub.com/korthout/backport-action/releases/tag/v3.0.0): Backport-action v3.0.0 [Compare Source](https://togithub.com/zeebe-io/backport-action/compare/v2.5.0...v3.0.0) #### Changed - \[Breaking] Use merge method to cherry-pick by default by [@korthout](https://togithub.com/korthout) in [https://github.com/korthout/backport-action/pull/420](https://togithub.com/korthout/backport-action/pull/420) This release changes the default behavior of the action to determine which commits are cherry-picked. While this behavior change doesn't necessarily require changes to your workflow, it warrants a major version bump. Previously, the action cherry-picked the commits from the pull request. Specifically, those reachable from the pull request's head and not reachable from the pull request's base. From now on, the action cherry-picks the commits based on the method used to merge the pull request by default. - For "Squash and merge", the action cherry-picks the squashed commit. - For "Rebase and merge", the action cherry-picks the rebased commits. - For "Merged as a merge commit", the action cherry-picks the commits from the pull request. If you previously used the experimental `detect_merge_method` input, we suggest you remove it from your workflow. This experimental input has been deprecated and replaced by the [`cherry_picking`](https://togithub.com/korthout/backport-action?tab=readme-ov-file#cherry_picking) input. If you want to return to the previous behavior, you can set the [`cherry_picking`](https://togithub.com/korthout/backport-action?tab=readme-ov-file#cherry_picking) input to `pull_request_head`. This behavior was previously available via the experimental `detect_merge_method` input, introduced in [https://github.com/korthout/backport-action/pull/399](https://togithub.com/korthout/backport-action/pull/399). Special thanks go out to [@jschmid1](https://togithub.com/jschmid1) for contributing this feature. #### Added This release also adds two new experimental features. Special shoutouts to [@tasso94](https://togithub.com/tasso94) and [@vermz99](https://togithub.com/vermz99) for contributing these! - Allow backporting to a downstream repository by [@tasso94](https://togithub.com/tasso94) in [https://github.com/korthout/backport-action/pull/405](https://togithub.com/korthout/backport-action/pull/405) With the experimental [`downstream_repo`](https://togithub.com/korthout/backport-action?tab=readme-ov-file#downstream_repo) and [`downstream_owner`](https://togithub.com/korthout/backport-action?tab=readme-ov-file#downstream_owner) inputs, you can backport to a repository other than where the workflow runs. For example, when you use a fork to maintain the previously released versions. You can also see this as backporting to a remote repository, but we felt it was better described as backporting to a downstream repository. The default behavior remains that the action always backports to the repository in which the workflow runs. - Add `conflict_resolution` input by [@vermz99](https://togithub.com/vermz99) in [https://github.com/korthout/backport-action/pull/417](https://togithub.com/korthout/backport-action/pull/417) With the experimental [`conflict_resolution`](https://togithub.com/korthout/backport-action?tab=readme-ov-file#conflict_resolution) input, you can now change how the action will handle conflicts during cherry-picking. Set it to `draft_commit_conflicts` to create a draft pull request with the first conflict encountered committed to reduce some of the manual efforts in backporting. The default behavior stays like before and can be configured explicitly as `fail`. In that case, the backport fails when the cherry-pick encounters a conflict. #### Updated Dependencies - build(deps): bump undici from 5.28.3 to 5.28.4 by [@dependabot](https://togithub.com/dependabot) in [https://github.com/korthout/backport-action/pull/418](https://togithub.com/korthout/backport-action/pull/418) - build(deps): bump dedent from 1.5.1 to 1.5.3 by [@dependabot](https://togithub.com/dependabot) in [https://github.com/korthout/backport-action/pull/419](https://togithub.com/korthout/backport-action/pull/419) #### New Contributors - [@tasso94](https://togithub.com/tasso94) made their first contribution in [https://github.com/korthout/backport-action/pull/405](https://togithub.com/korthout/backport-action/pull/405) - [@vermz99](https://togithub.com/vermz99) made their first contribution in [https://github.com/korthout/backport-action/pull/417](https://togithub.com/korthout/backport-action/pull/417) **Full Changelog**: https://github.com/korthout/backport-action/compare/v2.5.0...v3.0.0Configuration
📅 Schedule: 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.
This PR was generated by Mend Renovate. View the repository job log.