Rename some css highlight test cases #30905
Merged
Conversation
This file contains 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
We now have tests with the same file name in chromium and wpt upstream, which cause a merge conflict when exporting and importing the changes. Rename the file names at upstream to resolve such conflict.
KyleJu
approved these changes
Sep 21, 2021
|
@delan FYI! |
|
Sorry about the mess, these tests landed in both #30692 (upstream) and #30813 (CL:2850068), which I didn’t expect to cause a merge conflict (given that the files on both sides were identical). |
This was referenced Sep 23, 2021
|
Thanks for removing the duplicates! |
Gabisampaio
pushed a commit
to Gabisampaio/wpt
that referenced
this pull request
Nov 18, 2021
We now have tests with the same file name in chromium and wpt upstream, which cause a merge conflict when exporting and importing the changes. Rename the file names at upstream to resolve such conflict.
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.
We now have tests with the same file name in chromium and wpt upstream,
which cause a merge conflict when exporting and importing the changes.
Rename the file names at upstream to resolve such conflict.