Commit-queue should automatically handle PRs with merge commits from the target branch

Open
#967 4 comments 0 reactions 0 assignees View on GitHub

Nobody has claimed this yet.

Assessment

Difficulty
4/5
Estimated time
3-5 days
Newbie friendliness
35/100
Issue type
Bug
Clarity
Mostly clear
Activity status
Stale
Tech stack
git, javascript
Domain
cli, tooling

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.

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.

Dominant language
JavaScript
Stars
313
Forks
137
Avg merge
2d 8h
Merged PRs (30d)
24

Contributor guide

Open the contributing guide

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

More from nodejs/node-core-utils

All issues in nodejs/node-core-utils

Similar issues

More JavaScript issues

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.