Skip to content

Fix merge conflicts with 0.52 branch for async changes#53

Merged
allansson merged 200 commits intomaster-async-browserfrom
async/fix-merge-conflicts
Jun 18, 2024
Merged

Fix merge conflicts with 0.52 branch for async changes#53
allansson merged 200 commits intomaster-async-browserfrom
async/fix-merge-conflicts

Conversation

@allansson
Copy link
Copy Markdown

Please fill in this template.

nwalters512 and others added 30 commits April 30, 2024 10:03
…n for users() to bring it up to date for Hubot v11 by @yincrash
…@googlemaps-bot

Co-authored-by: copybara-service[bot] <copybara-service[bot]@users.noreply.github.com>
…hChildren type alias for ChunkExtractorManager props by @gbettencourt
@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Jun 18, 2024

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 74 committers have signed the CLA.

✅ allansson
✅ joanlopez
❌ remcohaszing
❌ YuseiUeno
❌ PCOffline
❌ tpluscode
❌ googlemaps-bot
❌ rhcarvalho
❌ auvred
❌ OliverDumrique
❌ dawaltconley
❌ andrewbranch
❌ ElizabethSamuel-MSFT
❌ Ha-limLee
❌ typescript-bot
❌ robrichard
❌ samantharamon
❌ mikhuang
❌ Weldawadyathink
❌ ffflorian
❌ facularrauri
❌ double-beep
❌ Gcommer
❌ sandersn
❌ EvanHahn
❌ LucVidal360
❌ alitas
❌ Armanio
❌ elliottlawrence
❌ azerum
❌ manstie
❌ btoo
❌ fdaciuk
❌ Jarred-Sumner
❌ eLoyyyyy
❌ sosoba
❌ iisaduan
❌ wgsadmin
❌ awphi
❌ codershiba
❌ LeoDog896
❌ xtianhill
❌ dr-vortex
❌ dannyb648
❌ princessjeremie
❌ jvert
❌ chdanielmueller
❌ mayurandhare13
❌ eps1lon
❌ yincrash
❌ mildsunrise
❌ cneumann
❌ manzoorwanijk
❌ mkapal
❌ douglasg14b
❌ barinbritva
❌ jwueller
❌ sugardave
❌ samijaber
❌ vthemelis
❌ Finomnis
❌ FreeWall
❌ Akatroj
❌ agustaf9
❌ ZachLegros
❌ Methuselah96
❌ tomasdev
❌ sangcnguyen
❌ cthompson92
❌ jakebailey
❌ sy-filis
❌ J-295
❌ alison-mk
❌ jaccarmac


codershiba seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

Copy link
Copy Markdown
Author

@allansson allansson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Self-review

Comment thread types/k6/test/browser.ts
Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a huge PR but this is the only thing that was changed by me. Other files are due to the 0.52 pulling in the latest version from upstream.

Most of the conflicts were cause between the tap api already being updated to async and the indentation added when wrapping the tests in a function.

@allansson allansson merged commit 134104e into master-async-browser Jun 18, 2024
@inancgumus inancgumus deleted the async/fix-merge-conflicts branch June 18, 2024 08:52
@allansson
Copy link
Copy Markdown
Author

Apologies to anyone being pinged about signing our CLA. It's my error because of doing a merge commit from master into this branch. You of course don't have to sign anything.

@james-pre
Copy link
Copy Markdown

@allansson I've updated my GitHub username from @dr-vortex to @james-pre. Please update your comment(s), and I can delete this one. I'm writing this comment when I can't make the change myself.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.