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.

Sign up for GitHub

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

Jump to bottom

Improve manual instructions #305

Open
korthout opened this issue Dec 15, 2022 · 1 comment
Open

Improve manual instructions #305

korthout opened this issue Dec 15, 2022 · 1 comment
Labels
enhancement New feature or request good first issue Good for newcomers

Comments

@korthout
Copy link
Owner

We should be able to simplify the manual instructions that are commented when the action is unable to backport the pull request (e.g. due to conflicts).

  • make sure the relevant commits are available locally by adding a fetch of the pull request git fetch origin refs/pull/<number>/head
  • no need to determine the common ancestor anymore,
    instead just use a shorthand for ^<base> and <head> (i.e. <base>..<head>): git cherry-pick -x <base>..<head>
@korthout korthout added enhancement New feature or request good first issue Good for newcomers labels Dec 15, 2022
@korthout
Copy link
Owner Author

Although this improvement would be useful, I want to take a slightly different route when working on this myself.

Instead of directly replacing the instructions (which I'm happy to receive a PR for by the way), I want to enable users to define their own manual instructions by making them configurable as an input. This input should behave the same as other inputs where placeholders can be used like pull_description and pull_title.

To build these instructions, we'll need new placeholders for the baseref, headref, and branchname.

This was referenced Nov 7, 2023
Closed
Merged
@AlexVermette-Eaton AlexVermette-Eaton mentioned this issue Apr 3, 2024
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement New feature or request good first issue Good for newcomers
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@korthout