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

chore(renovate): only auto rebase renovate PRs when conflicted #2406

Merged
merged 1 commit into from
Jun 12, 2024

Conversation

bkrem
Copy link
Member

@bkrem bkrem commented Jun 12, 2024

Context

@bkrem bkrem requested review from chris13524 and tomiir June 12, 2024 13:57
Copy link

vercel bot commented Jun 12, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
web3modal-gallery 🛑 Canceled (Inspect) Jun 12, 2024 1:57pm
web3modal-laboratory 🛑 Canceled (Inspect) Jun 12, 2024 1:57pm

@vercel vercel bot temporarily deployed to Preview – web3modal-gallery June 12, 2024 13:57 Inactive
@vercel vercel bot temporarily deployed to Preview – web3modal-laboratory June 12, 2024 13:57 Inactive
Copy link
Member

@chris13524 chris13524 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this works because PRs must incorporate all changes before they can be merged, not just when conflicted

@enesozturk enesozturk changed the base branch from V4 to main June 12, 2024 14:32
@bkrem
Copy link
Member Author

bkrem commented Jun 12, 2024

I don't think this works because PRs must incorporate all changes before they can be merged, not just when conflicted

Point is that you manually trigger a rebase via the checkbox in the renovate PR when necessary:
Screenshot 2024-06-12 at 16 34 32

This isn't a must have but it was pretty painful just now when we were trying to deploy the website changes and renovatebot kept clogging up the vercel queue with rebases of open PRs in this repo.

@bkrem bkrem merged commit 0792ffd into main Jun 12, 2024
6 of 9 checks passed
@bkrem bkrem deleted the chore/renovate-rebase-only-conflicted branch June 12, 2024 18:26
This was referenced Jun 14, 2024
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.

None yet

3 participants