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-dev): Bump temp from 0.8.3 to 0.9.1 #1156

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jun 29, 2020

Bumps temp from 0.8.3 to 0.9.1.

Release notes

Sourced from temp's releases.

v0.9.1

No release notes provided.

Bump Version to v0.9.0

Bumps version 0.9.0 and resolves minor bugs with package.

Commits
Maintainer changes

This version was pushed to npm by miguelsolano, a new releaser for temp since your current version.


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

bert-e commented Jun 29, 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 Jun 29, 2020

Conflict

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

@bert-e
Copy link
Contributor

bert-e commented Jun 30, 2020

Conflict

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

@bert-e
Copy link
Contributor

bert-e commented Jun 30, 2020

Conflict

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

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

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

@dependabot dependabot bot force-pushed the dependabot/npm_and_yarn/development/7.4/temp-0.9.1 branch from 27578ce to 88c133b Compare June 30, 2020 20:00
@bert-e
Copy link
Contributor

bert-e commented Jun 30, 2020

History mismatch

Merge commit #27578ce2a1c910674020763c98509a3557d37091 on the integration branch
w/7.7/dependabot/npm_and_yarn/development/7.4/temp-0.9.1 is merging a branch which is neither the current
branch dependabot/npm_and_yarn/development/7.4/temp-0.9.1 nor the development branch
development/7.7.

It is likely due to a rebase of the branch dependabot/npm_and_yarn/development/7.4/temp-0.9.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.

@jonathan-gramain
Copy link
Contributor

/reset

@bert-e
Copy link
Contributor

bert-e commented Jun 30, 2020

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Jun 30, 2020

Conflict

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

@bert-e
Copy link
Contributor

bert-e commented Jun 30, 2020

Conflict

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

@bert-e
Copy link
Contributor

bert-e commented Jun 30, 2020

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/6.4
  • stabilization/7.7.0

Follow integration pull requests if you would like to be notified of
build statuses by email.

@bert-e
Copy link
Contributor

bert-e commented Jun 30, 2020

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include a mandatory approval from @jonathan-gramain.

@jonathan-gramain
Copy link
Contributor

/bypass_jira_check

@bert-e
Copy link
Contributor

bert-e commented Jun 30, 2020

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Peer approvals must include a mandatory approval from @jonathan-gramain.

The following options are set: bypass_jira_check

@jonathan-gramain
Copy link
Contributor

/bypass_author_approval

@bert-e
Copy link
Contributor

bert-e commented Jun 30, 2020

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/7.4

  • ✔️ development/7.7

  • ✔️ development/7.8

  • ✔️ development/8.1

The following branches will NOT be impacted:

  • development/6.4
  • stabilization/7.7.0

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: bypass_author_approval, bypass_jira_check

@bert-e
Copy link
Contributor

bert-e commented Jun 30, 2020

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/7.4

  • ✔️ development/7.7

  • ✔️ development/7.8

  • ✔️ development/8.1

The following branches have NOT changed:

  • development/6.4
  • stabilization/7.7.0

Please check the status of the associated issue None.

Goodbye dependabot[bot].

@bert-e bert-e merged commit f9dafb1 into development/7.4 Jun 30, 2020
@bert-e bert-e deleted the dependabot/npm_and_yarn/development/7.4/temp-0.9.1 branch June 30, 2020 20:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants