Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Playwright - Fix some warnings about docstrings and parameters from the JavaScript IDE #5060

Merged
merged 1 commit into from
Dec 2, 2024

Conversation

Gustry
Copy link
Member

@Gustry Gustry commented Dec 2, 2024

Playwright - Fix some warnings about docstrings and parameters from the JavaScript IDE

@Gustry Gustry added tests unit tests and docker configuration for tests run end2end If the PR must run end2end tests or not backport release_3_7 backport release_3_8 backport release_3_9 labels Dec 2, 2024
@Gustry Gustry requested a review from nboisteault December 2, 2024 18:53
@github-actions github-actions bot added this to the 3.10.0 milestone Dec 2, 2024
@Gustry Gustry merged commit cb02310 into 3liz:master Dec 2, 2024
18 checks passed
@3liz-bot
Copy link
Contributor

3liz-bot commented Dec 2, 2024

The backport to release_3_7 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply cedee8418... Playwright - Fix some warnings about docstrings from the JavaScript IDE
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging tests/end2end/playwright/globals.js
CONFLICT (content): Merge conflict in tests/end2end/playwright/globals.js

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_7 release_3_7
# Navigate to the new working tree
cd .worktrees/backport-release_3_7
# Create a new branch
git switch --create backport-5060-to-release_3_7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick cedee841810dd3183154667ea1a30a5fea52ec47
# Push it to GitHub
git push --set-upstream origin backport-5060-to-release_3_7
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_7

Then, create a pull request where the base branch is release_3_7 and the compare/head branch is backport-5060-to-release_3_7.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release_3_8 backport release_3_9 failed backport run end2end If the PR must run end2end tests or not tests unit tests and docker configuration for tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants