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.

Sign up for GitHub

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

Jump to bottom

Add combine-prs workflow #4176

Merged
merged 2 commits into from
Jun 8, 2021
Merged

Add combine-prs workflow #4176

merged 2 commits into from
Jun 8, 2021

Conversation

rnorth
Copy link
Member

@rnorth rnorth commented Jun 8, 2021 •
edited
Loading

From https://github.com/hrvey/combine-prs-workflow

Refs #4172

This PR should let us combine passing dependabot PRs into one.

Caveats:

  • We must create a merge commit for the combined PR, rather than 'squash & merge'.
  • This approach will still be tripped up by adjacent-line merge conflicts. Combine many dependabot PRs into one #4172 mentions how I'd propose we tackle that in the future.

@rnorth rnorth merged commit 24610cb into master Jun 8, 2021
@rnorth rnorth deleted the combine-prs branch June 8, 2021 16:11
@rnorth rnorth mentioned this pull request Jun 8, 2021
Open
@bsideup bsideup added this to the next milestone Jul 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bsideup bsideup Awaiting requested review from bsideup

@kiview kiview Awaiting requested review from kiview

Assignees
No one assigned
Labels
type/housekeeping
Projects
None yet
Milestone
1.16.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@rnorth @bsideup