tools: avoid test/fixtures/wpt/README.md conflicts#63938
Closed
panva wants to merge 1 commit into
Closed
Conversation
Collaborator
|
Review requested:
|
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
1b90636 to
4deb0a6
Compare
aduh95
approved these changes
Jun 16, 2026
MattiasBuelens
approved these changes
Jun 16, 2026
anonrig
approved these changes
Jun 16, 2026
watilde
approved these changes
Jun 16, 2026
lpinca
approved these changes
Jun 16, 2026
Ethan-Arrowood
approved these changes
Jun 17, 2026
daeyeon
approved these changes
Jun 18, 2026
Collaborator
Commit Queue failed- Loading data for nodejs/node/pull/63938 ✔ Done loading data for nodejs/node/pull/63938 ----------------------------------- PR info ------------------------------------ Title tools: avoid test/fixtures/wpt/README.md conflicts (#63938) Author Filip Skokan <panva.ip@gmail.com> (@panva) Branch panva:avoid-fixtures-wpt-readme-conflicts -> nodejs:main Labels meta, author ready, lts-watch-v22.x Commits 1 - tools: avoid test/fixtures/wpt/README.md conflicts Committers 1 - Filip Skokan <panva.ip@gmail.com> PR-URL: https://github.com/nodejs/node/pull/63938 Refs: https://github.com/nodejs/node-core-utils/pull/1094 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Mattias Buelens <mattias@buelens.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev> Reviewed-By: Daeyeon Jeong <daeyeon.dev@gmail.com> ------------------------------ Generated metadata ------------------------------ PR-URL: https://github.com/nodejs/node/pull/63938 Refs: https://github.com/nodejs/node-core-utils/pull/1094 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Mattias Buelens <mattias@buelens.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev> Reviewed-By: Daeyeon Jeong <daeyeon.dev@gmail.com> -------------------------------------------------------------------------------- ℹ This PR was created on Tue, 16 Jun 2026 08:35:54 GMT ✔ Approvals: 7 ✔ - Antoine du Hamel (@aduh95) (TSC): https://github.com/nodejs/node/pull/63938#pullrequestreview-4504697609 ✔ - Mattias Buelens (@MattiasBuelens): https://github.com/nodejs/node/pull/63938#pullrequestreview-4505073432 ✔ - Yagiz Nizipli (@anonrig) (TSC): https://github.com/nodejs/node/pull/63938#pullrequestreview-4506893543 ✔ - Daijiro Wachi (@watilde): https://github.com/nodejs/node/pull/63938#pullrequestreview-4507077499 ✔ - Luigi Pinca (@lpinca): https://github.com/nodejs/node/pull/63938#pullrequestreview-4509796279 ✔ - Ethan Arrowood (@Ethan-Arrowood): https://github.com/nodejs/node/pull/63938#pullrequestreview-4514929430 ✔ - Daeyeon Jeong (@daeyeon): https://github.com/nodejs/node/pull/63938#pullrequestreview-4523110867 ✔ Last GitHub CI successful ✘ No Jenkins CI runs detected -------------------------------------------------------------------------------- ✔ Aborted `git node land` session in /home/runner/work/node/node/.ncuhttps://github.com/nodejs/node/actions/runs/27750777934 |
panva
added a commit
that referenced
this pull request
Jun 18, 2026
Signed-off-by: Filip Skokan <panva.ip@gmail.com> PR-URL: #63938 Refs: nodejs/node-core-utils#1094 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Mattias Buelens <mattias@buelens.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev> Reviewed-By: Daeyeon Jeong <daeyeon.dev@gmail.com>
Member
Author
|
Landed in d1ff9a0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR avoids concurrent automated WPT updates from running into a conflict - e.g. this week's #63898 and #63899
I'll follow up with an update to @node-core/utils to stop generating updates for this file.
cc @nodejs/web-standards
Refs: nodejs/node-core-utils#1094