-
Notifications
You must be signed in to change notification settings - Fork 42
Comparing changes
Open a pull request
base repository: korthout/backport-action
base: v2.1.0
head repository: korthout/backport-action
compare: v2.1.1
- 10 commits
- 5 files changed
- 4 contributors
Commits on Nov 5, 2023
-
Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 57e8244 - Browse repository at this point
Copy the full SHA 57e8244View commit details
Commits on Nov 7, 2023
-
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>
Configuration menu - View commit details
-
Copy full SHA for 494548a - Browse repository at this point
Copy the full SHA 494548aView commit details -
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
Configuration menu - View commit details
-
Copy full SHA for e45fafa - Browse repository at this point
Copy the full SHA e45fafaView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for bf66681 - Browse repository at this point
Copy the full SHA bf66681View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 3e20570 - Browse repository at this point
Copy the full SHA 3e20570View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 4fed997 - Browse repository at this point
Copy the full SHA 4fed997View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 19a4042 - Browse repository at this point
Copy the full SHA 19a4042View commit details -
Merge pull request #397 from korthout/395-skip-merge-commits-in-sugge…
…stion Skip merge commits in suggestion
Configuration menu - View commit details
-
Copy full SHA for 487faf2 - Browse repository at this point
Copy the full SHA 487faf2View commit details -
Signed-off-by: Nico Korthout <korthout@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for a13e378 - Browse repository at this point
Copy the full SHA a13e378View commit details -
Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 08bafb3 - Browse repository at this point
Copy the full SHA 08bafb3View commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff v2.1.0...v2.1.1