[2026-05-24] Tests on `debian12-x64` have been failing with error "Merge conflict in Makefile"

[trivikr]

Describe the bug

[2026-05-24] Tests on debian12-x64 have been failing with error "Merge conflict in Makefile"

Steps to reproduce

Examine failures in node-test-commit-linux on 2026-05-24

Observed behavior

Git tries to replay almost the entire Node history onto the PR commits, resulting in the conflict in Makefile.

+ git status
HEAD detached at origin/_jenkins_local_branch
nothing to commit, working tree clean
+ git rev-parse HEAD
1d297dcf6afa42a4699b9ec268bd045e3f7f5177
+ git rev-parse 1dbea7a20de2c9f77a20488bcec8720a256c7739
1dbea7a20de2c9f77a20488bcec8720a256c7739
+ '[' -z 1d297dcf6afa42a4699b9ec268bd045e3f7f5177 ']'
+ echo 1d297dcf6afa42a4699b9ec268bd045e3f7f5177
+ grep -qE '^[0-9a-fA-F]+$'
++ git rev-parse HEAD
++ git rev-parse 1d297dcf6afa42a4699b9ec268bd045e3f7f5177
+ '[' 1d297dcf6afa42a4699b9ec268bd045e3f7f5177 '!=' 1d297dcf6afa42a4699b9ec268bd045e3f7f5177 ']'
+ '[' -n 1dbea7a20de2c9f77a20488bcec8720a256c7739 ']'
+ git rebase --committer-date-is-author-date 1dbea7a20de2c9f77a20488bcec8720a256c7739
Rebasing (1/46550)
Rebasing (2/46550)
Auto-merging Makefile
CONFLICT (add/add): Merge conflict in Makefile
error: could not apply 61890720c8a... add readme and initial code
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 61890720c8a... add readme and initial code
Build step 'Execute shell' marked build as failure

Example failure: https://ci.nodejs.org/job/node-test-commit-linux/70206/nodes=debian12-x64/console

Expected behavior

No issues when rebasing

+ git status
HEAD detached at origin/_jenkins_local_branch
nothing to commit, working tree clean
+ git rev-parse HEAD
d25477b1a26dc9fdc70c68c9656b7ce86bb7e171
+ git rev-parse 1ddb754d392da419f3c4a96a1520ee84e1019699
1ddb754d392da419f3c4a96a1520ee84e1019699
+ '[' -z d25477b1a26dc9fdc70c68c9656b7ce86bb7e171 ']'
+ grep -qE '^[0-9a-fA-F]+$'
+ echo d25477b1a26dc9fdc70c68c9656b7ce86bb7e171
++ git rev-parse HEAD
++ git rev-parse d25477b1a26dc9fdc70c68c9656b7ce86bb7e171
+ '[' d25477b1a26dc9fdc70c68c9656b7ce86bb7e171 '!=' d25477b1a26dc9fdc70c68c9656b7ce86bb7e171 ']'
+ '[' -n 1ddb754d392da419f3c4a96a1520ee84e1019699 ']'
+ git rebase --committer-date-is-author-date 1ddb754d392da419f3c4a96a1520ee84e1019699
Rebasing (1/1)

Successfully rebased and updated detached HEAD.
+ '[' -n '' ']'

Example success: https://ci.nodejs.org/job/node-test-commit-linux/70205/nodes=debian12-x64/consoleFull

Additional context

Thread on OpenJS slack: https://openjs-foundation.slack.com/archives/C03BJP63CH0/p1779671678258339

[trivikr]

This failure is listed under fatal: No rebase in progress: https://github.com/search?q=repo%3Anodejs%2Freliability%20%22fatal%3A%20No%20rebase%20in%20progress%22&type=code

There are 8 occurrences for 2025-05-25 (UTC): https://github.com/nodejs/reliability/blob/main/reports/2026-05-25.md

[aduh95]

@nodejs/build is this being investigated? It's blocking quite a few PRs

[sxa]

I've just run a node-stress-single-test job on the machine which appears to have run through ok in the same workspace directory. I'll keep an eye on it to see if subsequent things are ok ...
Not sure at the moment if that cleared the directory in a better way or if the stress job isn't quite representative.
I did also note that there was a an old make run-ci process from May 6th still on the machine, but I wouldn't expect that to block things on Linux.

[sxa]

That didn't seem to fix it for node-test-commit-linux so I've manually done a git rebase --abort on the machine which should make it happy.

[sxa]

https://ci.nodejs.org/job/node-test-commit-linux/nodes=debian12-x64/70260/console looks happy so I'm going to close this

For future reference this was the `git status` output on the machine:

iojs@test-ibm-debian12-x64-1:~/build/workspace/node$ git status
interactive rebase in progress; onto 460c35085f6
git Last commands done (2 commands done):
   pick 9d7895c567e add dependencies
   pick 61890720c8a add readme and initial code
Next commands to do (46554 remaining commands):
   pick 6ded7fec5fb ...
   pick 4a5bab8ef62 intermediate commit. nothing works.
  (use "git rebase --edit-todo" to view and edit)
You are currently rebasing.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
	new file:   README
	new file:   js_http_request_processor.cc
	new file:   js_http_request_processor.h
	new file:   server.cc

Unmerged paths:
  (use "git restore --staged <file>..." to unstage)
  (use "git add <file>..." to mark resolution)
	both added:      Makefile

iojs@test-ibm-debian12-x64-1:~/build/workspace/node$

[aduh95]

Still getting it in e.g. https://ci.nodejs.org/job/node-test-commit-linux/nodes=debian12-x64/70263/console

[trivikr]

Do you want to consider fetching refs before test commit rebase suggested in #4346?

[sxa]

Still getting it in e.g. https://ci.nodejs.org/job/node-test-commit-linux/nodes=debian12-x64/70263/console

Yeah seems it only fixed it for one node version. I've wiped the entire clone that's on the machine so hopefully that will have resolved it now