Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump korthout/backport-action from 3.0.0 to 3.0.2 #96

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jun 3, 2024

Bumps korthout/backport-action from 3.0.0 to 3.0.2.

Release notes

Sourced from korthout/backport-action's releases.

Backport-action v3.0.2

Fixed

This release fixes a small bug in the draft_commit_conflicts option for the experimental 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 korthout/backport-action#421.

Full Changelog: korthout/backport-action@v3.0.1...v3.0.2

Backport-action v3.0.1

Fixed

This release fixes a small bug in the draft_commit_conflicts option for the experimental 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.

Full Changelog: korthout/backport-action@v3.0.0...v3.0.1

Commits
  • bd410d3 dist: release 3.0.2
  • 7e34d5f dist: build new artifacts
  • 9237785 Merge pull request #423 from korthout/korthout-fix-draft-checkout
  • 8fef44e fix: checkout branch not target
  • f73aeb9 dist: release 3.1.0-SNAPSHOT
  • ecb5bc3 dist: release 3.0.1
  • c7a7132 dist: build new artifacts
  • da478f7 Merge pull request #422 from korthout/korthout-fix-draft-conflict-suggestions
  • 863937d fix: fetch and checkout draft pr branch directly
  • 7d390fd dist: release 3.1.0-SNAPSHOT
  • See full diff 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 merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @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 3.0.0 to 3.0.2.
- [Release notes](https://github.com/korthout/backport-action/releases)
- [Commits](korthout/backport-action@7e7cb19...bd410d3)

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

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label Jun 3, 2024
Copy link
Collaborator

@minijackson minijackson left a comment

Choose a reason for hiding this comment

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

Tested, works.

@minijackson minijackson merged commit 5fed3bf into master Jun 5, 2024
5 checks passed
@dependabot dependabot bot deleted the dependabot/github_actions/korthout/backport-action-3.0.2 branch June 5, 2024 08:18
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant