Skip to content

Update dependency ember-cli-meta-tags to v6.1.1 #2693

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

Merged
merged 1 commit into from
Oct 6, 2020

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Aug 16, 2020

This PR contains the following updates:

Package Type Update Change
ember-cli-meta-tags devDependencies minor 6.0.0 -> 6.1.1

Release Notes

ronco/ember-cli-meta-tags

v6.1.1

Compare Source

v6.1.0

Compare Source


Renovate configuration

📅 Schedule: At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

♻️ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, check this box

This PR has been generated by WhiteSource Renovate. View repository job log here.

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @sgrif (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@Turbo87
Copy link
Member

Turbo87 commented Aug 16, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Aug 16, 2020

📌 Commit e2c3d1a has been approved by Turbo87

@bors
Copy link
Contributor

bors commented Aug 16, 2020

☔ The latest upstream changes (presumably #2697) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Contributor

bors commented Aug 16, 2020

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout renovate/ember-cli-meta-tags-6.x (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self renovate/ember-cli-meta-tags-6.x --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Auto-merging package.json
Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Automatic merge failed; fix conflicts and then commit the result.

@renovate renovate bot force-pushed the renovate/ember-cli-meta-tags-6.x branch from e2c3d1a to 36b4d38 Compare August 16, 2020 17:55
@bors
Copy link
Contributor

bors commented Aug 19, 2020

☔ The latest upstream changes (presumably #2701) made this pull request unmergeable. Please resolve the merge conflicts.

@renovate renovate bot force-pushed the renovate/ember-cli-meta-tags-6.x branch from 36b4d38 to 0adaa4d Compare August 19, 2020 07:52
@bors
Copy link
Contributor

bors commented Aug 24, 2020

☔ The latest upstream changes (presumably #2712) made this pull request unmergeable. Please resolve the merge conflicts.

@renovate renovate bot force-pushed the renovate/ember-cli-meta-tags-6.x branch from 0adaa4d to be9249d Compare August 24, 2020 22:41
@bors
Copy link
Contributor

bors commented Aug 29, 2020

☔ The latest upstream changes (presumably #2726) made this pull request unmergeable. Please resolve the merge conflicts.

@renovate renovate bot force-pushed the renovate/ember-cli-meta-tags-6.x branch from be9249d to c270b18 Compare August 29, 2020 15:54
@bors
Copy link
Contributor

bors commented Sep 1, 2020

☔ The latest upstream changes (presumably #2738) made this pull request unmergeable. Please resolve the merge conflicts.

@renovate renovate bot force-pushed the renovate/ember-cli-meta-tags-6.x branch from c270b18 to e68f9c4 Compare September 1, 2020 01:56
@bors
Copy link
Contributor

bors commented Sep 7, 2020

☔ The latest upstream changes (presumably #2755) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@renovate renovate bot force-pushed the renovate/ember-cli-meta-tags-6.x branch from e68f9c4 to 7a675b1 Compare September 7, 2020 22:13
@bors
Copy link
Contributor

bors commented Sep 17, 2020

☔ The latest upstream changes (presumably #2799) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@renovate renovate bot force-pushed the renovate/ember-cli-meta-tags-6.x branch from 7a675b1 to e7a2cac Compare September 17, 2020 23:36
@renovate renovate bot changed the title Update dependency ember-cli-meta-tags to v6.1.0 Update dependency ember-cli-meta-tags to v6.1.1 Sep 29, 2020
@renovate renovate bot force-pushed the renovate/ember-cli-meta-tags-6.x branch from e7a2cac to e1e29b7 Compare September 29, 2020 19:51
@renovate renovate bot force-pushed the renovate/ember-cli-meta-tags-6.x branch from e1e29b7 to 8ed91d3 Compare October 6, 2020 15:17
@Turbo87
Copy link
Member

Turbo87 commented Oct 6, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Oct 6, 2020

📌 Commit 8ed91d3 has been approved by Turbo87

@bors
Copy link
Contributor

bors commented Oct 6, 2020

⌛ Testing commit 8ed91d3 with merge c7eb626...

@bors
Copy link
Contributor

bors commented Oct 6, 2020

☀️ Test successful - checks-travis
Approved by: Turbo87
Pushing c7eb626 to master...

@bors bors merged commit c7eb626 into master Oct 6, 2020
@renovate renovate bot deleted the renovate/ember-cli-meta-tags-6.x branch October 6, 2020 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants