Closed dependabot[bot] closed 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/sinonjs/fake-timers-10.2.0
with contents from dependabot/npm_and_yarn/development/7.4/sinonjs/fake-timers-10.2.0
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/sinonjs/fake-timers-10.2.0 origin/development/7.10
$ git merge origin/dependabot/npm_and_yarn/development/7.4/sinonjs/fake-timers-10.2.0
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.10/dependabot/npm_and_yarn/development/7.4/sinonjs/fake-timers-10.2.0
The following options are set: bypass_author_approval, bypass_jira_check
Superseded by #2133.
Bumps @sinonjs/fake-timers from 6.0.1 to 10.2.0.
Changelog
Sourced from
@sinonjs/fake-timers
's changelog.... (truncated)
Commits
2fc8324
10.2.0bf84aa1
Updated release files for 10.2.0a111a71
Add mocks to NodeJS "timers" module (#467)dbdf02a
10.1.0bb541c9
Updated release files for 10.1.043645d9
Run Prettier on files12c21cf
JSOM: ensure props on window can be restoredae61990
Upgrade to (shared) ESLint config that handles ES6 syntaxf776b4a
Upgrade all packages556f689
Add clock.jump method (#465)Maintainer changes
This version was pushed to npm by fatso83, a new releaser for
@sinonjs/fake-timers
since your current version.Dependabot 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)