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.

Sign up for GitHub

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

Jump to bottom

build(deps): Bump level from 5.0.1 to 6.0.1 #1222

Closed
wants to merge 1 commit into from
Closed

build(deps): Bump level from 5.0.1 to 6.0.1 #1222

wants to merge 1 commit into from

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jul 21, 2020 •
edited
Loading

Bumps level from 5.0.1 to 6.0.1.

Release notes

Sourced from level's releases.

v6.0.1

Changed

  • Switch from opencollective-postinstall to npm funding (#173) (@Richienb)
  • Upgrade nyc devDependency from ^14.0.0 to ^15.0.0 (#169) (@vweevers)
  • Upgrade airtap devDependency from ^2.0.1 to ^3.0.0 (#171) (@vweevers)

v6.0.0

If you are upgrading: please see UPGRADING.md.

Changed

Added

Fixed

Changelog

Sourced from level's changelog.

[6.0.1] - 2020-03-04

Changed

  • Switch from opencollective-postinstall to npm funding (#173) (@Richienb)
  • Upgrade nyc devDependency from ^14.0.0 to ^15.0.0 (#169) (@vweevers)
  • Upgrade airtap devDependency from ^2.0.1 to ^3.0.0 (#171) (@vweevers)

[6.0.0] - 2019-10-19

Changed

Added

Fixed

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 Jul 21, 2020
@bert-e
Copy link
Contributor

bert-e commented Jul 21, 2020

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.

@bert-e
Copy link
Contributor

bert-e commented Jul 21, 2020

Conflict

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

I have not created the integration branch.

Here are the steps to resolve this conflict:

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

@bert-e
Copy link
Contributor

bert-e commented Jan 26, 2021

Conflict

There is a conflict between your branch dependabot/npm_and_yarn/development/7.4/level-6.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-6.0.1).

 $ git fetch
 $ git checkout origin/dependabot/npm_and_yarn/development/7.4/level-6.0.1
 $ git merge origin/development/7.4
 $ # <intense conflict resolution>
 $ git commit
 $ git push origin HEAD:dependabot/npm_and_yarn/development/7.4/level-6.0.1

@dependabot dependabot bot force-pushed the dependabot/npm_and_yarn/development/7.4/level-6.0.1 branch from 63d61a9 to 093e063 Compare January 26, 2021 10:06
@bert-e
Copy link
Contributor

bert-e commented Jan 26, 2021

Conflict

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

@bert-e
Copy link
Contributor

bert-e commented Apr 2, 2021

Conflict

There is a conflict between your branch dependabot/npm_and_yarn/development/7.4/level-6.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-6.0.1).

 $ git fetch
 $ git checkout origin/dependabot/npm_and_yarn/development/7.4/level-6.0.1
 $ git merge origin/development/7.4
 $ # <intense conflict resolution>
 $ git commit
 $ git push origin HEAD:dependabot/npm_and_yarn/development/7.4/level-6.0.1

@dependabot dependabot bot force-pushed the dependabot/npm_and_yarn/development/7.4/level-6.0.1 branch from 093e063 to 5147ab2 Compare April 2, 2021 20:29
@bert-e
Copy link
Contributor

bert-e commented Apr 2, 2021

Conflict

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

@dependabot
build(deps): Bump level from 5.0.1 to 6.0.1
b1f3ad6 
Bumps [level](https://github.com/Level/level) from 5.0.1 to 6.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...v6.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot force-pushed the dependabot/npm_and_yarn/development/7.4/level-6.0.1 branch from 5147ab2 to b1f3ad6 Compare April 9, 2021 00:58
@bert-e
Copy link
Contributor

bert-e commented Apr 9, 2021

History mismatch

Merge commit #5147ab2d05928fab98921aaa116a5ad3daf77ff5 on the integration branch
w/7.10/dependabot/npm_and_yarn/development/7.4/level-6.0.1 is merging a branch which is neither the current
branch dependabot/npm_and_yarn/development/7.4/level-6.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-6.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.

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Apr 19, 2021

Superseded by #1412.

@dependabot dependabot bot closed this Apr 19, 2021
@dependabot dependabot bot deleted the dependabot/npm_and_yarn/development/7.4/level-6.0.1 branch April 19, 2021 13:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@bert-e