-
Notifications
You must be signed in to change notification settings - Fork 20
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
build(deps): bump level from 5.0.1 to 7.0.1 #1608
Conversation
Hello dependabot[bot],My role is to assist you with the merge of this Status report is not available. The following options are set: bypass_author_approval, bypass_jira_check |
ConflictA conflict has been raised during the creation of 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 |
ConflictThere is a conflict between your branch Please resolve the conflict on the feature branch ( 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 |
f2c8e70
to
d75af00
Compare
ConflictA conflict has been raised during the creation of 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 |
d75af00
to
d2121a9
Compare
History mismatchMerge commit #d75af00e9d50ab453970267760b9a5f4af1dabd0 on the integration branch It is likely due to a rebase of the branch Please use the The following options are set: bypass_author_approval, bypass_jira_check |
d2121a9
to
d70c448
Compare
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]>
d70c448
to
d3a7ee3
Compare
Superseded by #1762. |
Bumps level from 5.0.1 to 7.0.1.
Release notes
Sourced from level's releases.
... (truncated)
Changelog
Sourced from level's changelog.
... (truncated)
Commits
2f56995
7.0.17083ec6
Bump dependencies to prevent dedupead8f924
Document new features (#207)904fd1f
Update metadata and add release workflow0ffb367
Bump codecov/codecov-action from 1.x to 2.x (#204)c82fdbc
Clarify close() documentation (#197)adfc39d
Move to GitHub Actions (#196)2d0a97f
7.0.0329e1f5
Add files to package.json and remove .npmignore0b3c11d
Document chained batch encoding options (Support encoding options on chained batch Level/levelup#633)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)