Merge conflicts on node-test-commit-* jobs
Nobody has claimed this yet.
- Dominant language
- Jinja
- Stars
- 541
- Forks
- 185
- Avg merge
- 22h 15m
- Merged PRs (30d)
- 4
Description
Raising this as a bit of an 'umbrella' issue to track occurrences of this problem. There have been various issues on it in the past and this one regarding debian12-x64 seems to have had most of the discussion on it as well as a potential PR that might fix it. I'm splitting this out as a seprate "umbrella" issue independent of the live incident ones to see what we can do about it. As can be seen from the list of issues in the search link above it's not specific to debian12, but anecdotally it feels like it's happened more often on there (technically I can't see why that might be, so I may be imagining it - I hit it again on Debian with the tests on nodejs/node#62251.
There as also a bit of analysis if it occurring on three separate test runs of a PR at https://github.com/nodejs/node/pull/65564#issuecomment-5432417117
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
Begin with issue 4345 and PR 4346, then compare the prior merge-conflict issues listed in the search link and the analysis in nodejs/node PR 65564. Done means determining a durable fix for merge conflicts across node-test-commit-* jobs, rather than tracking another incident.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- debian, node.js
- Domain
- ci-cd, infrastructure
- Issue type
- Bug
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Activity status
- Active
- Clarity
- Needs clarification
- Newbie friendliness
- 45/100