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

Update dependency web-push to v3.3.1 #2459

Merged
merged 1 commit into from
May 24, 2018
Merged

Update dependency web-push to v3.3.1 #2459

merged 1 commit into from
May 24, 2018

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented May 22, 2018

This Pull Request updates dependency web-push from v3.3.0 to v3.3.1

Release Notes

v3.3.1

Compare Source



This PR has been generated by Renovate Bot.

@renovate renovate bot added the Type: Dependencies Automatic updates for dependencies, managed by Renovate. label May 22, 2018
@xPaw xPaw added this to the 3.0.0 milestone May 22, 2018
@xPaw
Copy link
Member

xPaw commented May 23, 2018

@rarkins Any idea why github isn't complaining about this PR (and #2460) not being out of date? It's trying to update sinon which was already updated in master. Looks like a failed rebase or something.

@xPaw
Copy link
Member

xPaw commented May 24, 2018

Looks like it finally managed to rebase itself.

@xPaw xPaw merged commit 944b8d9 into master May 24, 2018
@renovate renovate bot deleted the renovate/web-push-3.x branch May 24, 2018 13:32
@rarkins
Copy link

rarkins commented May 24, 2018

@xPaw unless you have enabled "all PRs must be up-to-date with master" branch protection for a repository, or you have explicitly turned it on with Renovate's rebaseStalePrs set to true, then Renovate assumes that you don't want aggressive rebasing and therefore only does it once a conflict occurs. If you want Renovate to always rebase its PRs when it detects a change to master then you can add the preset :rebaseStalePrs to your extends array in config.

@xPaw
Copy link
Member

xPaw commented May 24, 2018

Cool I will add that to the config.

The reason I pinged you is because this PR initially had 2 package changes (web-push and sinon) which should have been conflicting with master, but for some reason did not.

@rarkins
Copy link

rarkins commented May 24, 2018

In terms of conflicts, that's determined by git/GitHub and Renovate just uses the API to retrieve the value. Rebasing stale is the safest way to update dependencies because then you're sure it's always tested against master every time, but it results in more CI builds so that's why it's not default behaviour.

Sorry I missed the message yesterday, btw. It was a tough day due to versions disappearing from npmjs so I was getting a lot of notifications.

@xPaw
Copy link
Member

xPaw commented May 24, 2018

Yeah I know GitHub does the conflict checking, which is why I found it very odd that it didn't find a conflict here. I primarly wanted to know why renovate-bot included unrelated package update in this PR.

No worries about the delay, thanks for your support!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Dependencies Automatic updates for dependencies, managed by Renovate.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants