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

build(deps): bump level from 5.0.1 to 7.0.1 #1608

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Oct 26, 2021

Bumps level from 5.0.1 to 7.0.1.

Release notes

Sourced from level's releases.

v7.0.1

Added

  • Document new features (#207) (ad8f924) (Vincent Weevers)

Fixed

  • Bump dependencies to prevent dedupe (7083ec6) (Vincent Weevers)
  • Clarify close() documentation (#197) (c82fdbc) (Vincent Weevers)

v7.0.0

If you are upgrading: please see UPGRADING.md.

Changed

  • Breaking: bump leveldown and level-packager (53bd922) (Vincent Weevers)
  • Breaking: bump level-js from 5.x to 6.x (#194) (1f6c603) (Alex Potsides)
  • Breaking: modernize syntax (Level/community#98) (d001b2c) (Vincent Weevers)
  • Add files to package.json and remove .npmignore (329e1f5) (Vincent Weevers)

Added

Removed

v6.0.1

Changed

v6.0.0

If you are upgrading: please see UPGRADING.md.

Changed

Added

... (truncated)

Changelog

Sourced from level's changelog.

[7.0.1] - 2021-10-02

Added

  • Document new features (#207) (ad8f924) (Vincent Weevers)

Fixed

  • Bump dependencies to prevent dedupe (7083ec6) (Vincent Weevers)
  • Clarify close() documentation (#197) (c82fdbc) (Vincent Weevers)

[7.0.0] - 2021-04-17

If you are upgrading: please see https://github.com/Level/level/blob/master/UPGRADING.md.

Changed

  • Breaking: bump leveldown and level-packager (53bd922) (Vincent Weevers)
  • Breaking: bump level-js from 5.x to 6.x (#194) (1f6c603) (Alex Potsides)
  • Breaking: modernize syntax (Level/community#98) (d001b2c) (Vincent Weevers)
  • Add files to package.json and remove .npmignore (329e1f5) (Vincent Weevers)

Added

Removed

[6.0.1] - 2020-03-04

Changed

[6.0.0] - 2019-10-19

If you are upgrading: please see https://github.com/Level/level/blob/master/UPGRADING.md.

Changed

... (truncated)

Commits

Dependabot compatibility score

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)

@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label Oct 26, 2021
@bert-e
Copy link
Contributor

bert-e commented Oct 26, 2021

Hello dependabot[bot],

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

@bert-e
Copy link
Contributor

bert-e commented Oct 26, 2021

Conflict

A conflict has been raised during the creation of
integration branch w/7.10/dependabot/npm_and_yarn/development/7.4/level-7.0.1 with contents from dependabot/npm_and_yarn/development/7.4/level-7.0.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/level-7.0.1 origin/development/7.10
 $ git merge origin/dependabot/npm_and_yarn/development/7.4/level-7.0.1
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.10/dependabot/npm_and_yarn/development/7.4/level-7.0.1

The following options are set: bypass_author_approval, bypass_jira_check

@bert-e
Copy link
Contributor

bert-e commented Nov 5, 2021

Conflict

There is a conflict between your branch dependabot/npm_and_yarn/development/7.4/level-7.0.1 and the
destination branch development/7.4.

Please resolve the conflict on the feature branch (dependabot/npm_and_yarn/development/7.4/level-7.0.1).

git fetch && \
git checkout origin/dependabot/npm_and_yarn/development/7.4/level-7.0.1 && \
git merge origin/development/7.4

Resolve merge conflicts and commit

git push origin HEAD:dependabot/npm_and_yarn/development/7.4/level-7.0.1

The following options are set: bypass_author_approval, bypass_jira_check

@dependabot dependabot bot force-pushed the dependabot/npm_and_yarn/development/7.4/level-7.0.1 branch from f2c8e70 to d75af00 Compare November 5, 2021 00:31
@bert-e
Copy link
Contributor

bert-e commented Nov 5, 2021

Conflict

A conflict has been raised during the creation of
integration branch w/8.1/dependabot/npm_and_yarn/development/7.4/level-7.0.1 with contents from w/7.10/dependabot/npm_and_yarn/development/7.4/level-7.0.1
and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/dependabot/npm_and_yarn/development/7.4/level-7.0.1 origin/development/8.1
 $ git merge origin/w/7.10/dependabot/npm_and_yarn/development/7.4/level-7.0.1
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/dependabot/npm_and_yarn/development/7.4/level-7.0.1

The following options are set: bypass_author_approval, bypass_jira_check

@dependabot dependabot bot force-pushed the dependabot/npm_and_yarn/development/7.4/level-7.0.1 branch from d75af00 to d2121a9 Compare January 20, 2022 00:28
@bert-e
Copy link
Contributor

bert-e commented Jan 20, 2022

History mismatch

Merge commit #d75af00e9d50ab453970267760b9a5f4af1dabd0 on the integration branch
w/7.10/dependabot/npm_and_yarn/development/7.4/level-7.0.1 is merging a branch which is neither the current
branch dependabot/npm_and_yarn/development/7.4/level-7.0.1 nor the development branch
development/7.10.

It is likely due to a rebase of the branch dependabot/npm_and_yarn/development/7.4/level-7.0.1 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: bypass_author_approval, bypass_jira_check

@dependabot dependabot bot force-pushed the dependabot/npm_and_yarn/development/7.4/level-7.0.1 branch from d2121a9 to d70c448 Compare February 7, 2022 17:10
Bumps [level](https://github.com/Level/level) from 5.0.1 to 7.0.1.
- [Release notes](https://github.com/Level/level/releases)
- [Changelog](https://github.com/Level/level/blob/master/CHANGELOG.md)
- [Commits](Level/level@v5.0.1...v7.0.1)

---
updated-dependencies:
- dependency-name: level
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot force-pushed the dependabot/npm_and_yarn/development/7.4/level-7.0.1 branch from d70c448 to d3a7ee3 Compare February 7, 2022 19:59
@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Mar 25, 2022

Superseded by #1762.

@dependabot dependabot bot closed this Mar 25, 2022
@dependabot dependabot bot deleted the dependabot/npm_and_yarn/development/7.4/level-7.0.1 branch March 25, 2022 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking_changes dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants