Open dependabot[bot] opened 1 year ago
My role is to assist you with the merge of this
pull request. Please type @bert-e help
to get information
on this process, or consult the user documentation.
Status report is not available.
The following options are set: bypass_author_approval, bypass_jira_check
A conflict has been raised during the creation of
integration branch w/7.10/dependabot/npm_and_yarn/development/7.4/socket.io-client-4.7.1
with contents from dependabot/npm_and_yarn/development/7.4/socket.io-client-4.7.1
and development/7.10
.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/7.10/dependabot/npm_and_yarn/development/7.4/socket.io-client-4.7.1 origin/development/7.10
$ git merge origin/dependabot/npm_and_yarn/development/7.4/socket.io-client-4.7.1
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.10/dependabot/npm_and_yarn/development/7.4/socket.io-client-4.7.1
The following options are set: bypass_author_approval, bypass_jira_check
Bumps socket.io-client from 2.3.1 to 4.7.1.
Release notes
Sourced from socket.io-client's releases.
... (truncated)
Changelog
Sourced from socket.io-client's changelog.
... (truncated)
Commits
0536fcc
chore(release): 4.7.16169bb8
chore: bump dev dependencies84ec6cf
refactor: expose the ESM build with debug (bis)630ff41
chore: bump engine.io-client to version 6.5.19b235ec
chore(release): 4.7.0f2892ab
fix: use same scope for setTimeout and clearTimeout calls (#1568)5bc94b5
fix: properly report timeout error when connecting781d753
feat: expose ESM build with debug (#1585)8f14b98
chore: bump engine.io-client to version 6.5.0a04ae1b
chore(release): 4.6.2Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)