nodejs / nodejs/node-core-utils
Commit-queue should automatically handle PRs with merge commits from the target branch
Nobody has claimed this yet.
- Dominant language
- JavaScript
- Stars
- 314
- Forks
- 137
- Avg merge
- 2d 8h
- Merged PRs (30d)
- 24
Description
Some contributors merge into their PR branch from main rather than rebasing. We might not recommend this, but it shouldn't be a major issue. Unfortunately it seems that the commit-queue label can't handle this, and fails with:
error: commit ... is a merge but no -m option was given.
fatal: cherry-pick failed
Here's a example I just ran into: https://github.com/nodejs/node/pull/59375#issuecomment-3178324429. More examples here.
AFAICT this then always requires manually landing the PR, but it feels like we should be able to handle these automatically without much trouble.
Contributor guide
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
Start by locating the commit-queue handling that invokes cherry-pick, then reproduce the reported failure with a pull request containing a merge from main. Done means the commit queue automatically processes such pull requests without requiring manual landing; the issue names no files or tests to run.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, javascript
- Domain
- cli, tooling
- Issue type
- Bug
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Activity status
- Stale
- Clarity
- Mostly clear
- Newbie friendliness
- 35/100