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 .repo-content-updater.yml to use default rebase setting #18979

Merged
merged 4 commits into from
Dec 10, 2024

Conversation

emlowe
Copy link
Contributor

@emlowe emlowe commented Dec 4, 2024

Dependabot should conflict less now with recent changes to version locking in the toml file so hopefully this will be ok to turn back to the default (which is auto)

@emlowe emlowe requested a review from a team as a code owner December 4, 2024 00:18
altendky
altendky previously approved these changes Dec 4, 2024
@emlowe emlowe added Exclude_Notes Use this label if the changes in the PR should be excluded from the release notes Changed Required label for PR that categorizes merge commit message as "Changed" for changelog labels Dec 4, 2024
Copy link
Contributor

github-actions bot commented Dec 4, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Dec 4, 2024
cmmarslender
cmmarslender previously approved these changes Dec 5, 2024
@emlowe emlowe dismissed stale reviews from cmmarslender and altendky via 71d5a63 December 5, 2024 16:40
@github-actions github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Dec 5, 2024
Copy link
Contributor

github-actions bot commented Dec 5, 2024

Conflicts have been resolved. A maintainer will review the pull request shortly.

@pmaslana pmaslana merged commit 3650efd into main Dec 10, 2024
363 checks passed
@pmaslana pmaslana deleted the EL-dependabot-rebase-default branch December 10, 2024 00:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changed Required label for PR that categorizes merge commit message as "Changed" for changelog Exclude_Notes Use this label if the changes in the PR should be excluded from the release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants