Describe the bug
[2026-06-09] Tests on test-rackspace-ubuntu2404-x64-1 have been failing with error "Merge conflict in Makefile"
Steps to reproduce
Examine failures in node-test-commit-custom-suites-freestyle on 2026-06-09
Observed behavior
Git tries to replay almost the entire Node history onto the PR commits, resulting in the conflict in Makefile.
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
These seem specific to test-rackspace-ubuntu2404-x64-1 in all cases.
The tests on test-rackspace-ubuntu2404-x64-2 or test-ibm-ubuntu2404-x64-1 are successful.
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 '' ']'
Additional context
Describe the bug
[2026-06-09] Tests on
test-rackspace-ubuntu2404-x64-1have been failing with error "Merge conflict in Makefile"Steps to reproduce
Examine failures in node-test-commit-custom-suites-freestyle on 2026-06-09
Observed behavior
Git tries to replay almost the entire Node history onto the PR commits, resulting in the conflict in
Makefile.These seem specific to
test-rackspace-ubuntu2404-x64-1in all cases.The tests on
test-rackspace-ubuntu2404-x64-2ortest-ibm-ubuntu2404-x64-1are successful.Expected behavior
No issues when rebasing
Additional context
debian12-x64have been failing with error "Merge conflict in Makefile" #4345