Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: korthout/backport-action
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.1.0
Choose a base ref
...
head repository: korthout/backport-action
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.1.1
Choose a head ref
  • 10 commits
  • 5 files changed
  • 4 contributors

Commits on Nov 5, 2023

  1. dist: release 2.2.0-SNAPSHOT

    Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
    github-actions[bot] committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    57e8244 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. build(deps): bump @types/dedent from 0.7.1 to 0.7.2

    Bumps [@types/dedent](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/dedent) from 0.7.1 to 0.7.2.
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/dedent)
    
    ---
    updated-dependencies:
    - dependency-name: "@types/dedent"
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    494548a View commit details
    Browse the repository at this point in the history
  2. Merge pull request #396 from korthout/dependabot/npm_and_yarn/types/d…

    …edent-0.7.2
    
    build(deps): bump @types/dedent from 0.7.1 to 0.7.2
    korthout authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    e45fafa View commit details
    Browse the repository at this point in the history
  3. refactor: remove unused error reasons

    This compose for backport script failure method was a remnant from when
    this action used a shell script to perform the git commands. Most
    reasons were dead code.
    korthout committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    bf66681 View commit details
    Browse the repository at this point in the history
  4. fix: suggest to cherry-pick specific commits

    The manual instructions still suggested to determine the commits to
    cherry-pick by determining the common ancestor (merge-base) of the head
    and base refs, first. However, this way has been abandoned for quite
    some time now. This especially became a problem now that merge commits
    can be skipped, meaning that the suggestion no longer produced a
    reliable result.
    
    Instead, we can simply suggest the same as the action does. It knows
    exactly which commits to cherry-pick.
    korthout committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    3e20570 View commit details
    Browse the repository at this point in the history
  5. fix: instruct to resolve conflicts

    When the cherr-picking failed, it's very likely that there are
    conflicts. We should instruct the user to cherry-pick locally and
    resolve any conflicts.
    korthout committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    4fed997 View commit details
    Browse the repository at this point in the history
  6. fix: suggest git switch over checkout

    The switch command has been around for 4 years now, and while still
    marked as experimental, I think it's fine to "switch" to it in the
    suggestion for local cherry-picking. It's unlikely that users are using
    such old git versions that it doesn't support git switch --create.
    korthout committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    19a4042 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #397 from korthout/395-skip-merge-commits-in-sugge…

    …stion
    
    Skip merge commits in suggestion
    korthout authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    487faf2 View commit details
    Browse the repository at this point in the history
  8. dist: build new artifacts

    Signed-off-by: Nico Korthout <korthout@users.noreply.github.com>
    korthout committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    a13e378 View commit details
    Browse the repository at this point in the history
  9. dist: release 2.1.1

    Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
    github-actions[bot] committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    08bafb3 View commit details
    Browse the repository at this point in the history
Loading