Skip to content

Add combine-prs workflow#4176

Merged
rnorth merged 2 commits intomasterfrom
combine-prs
Jun 8, 2021
Merged

Add combine-prs workflow#4176
rnorth merged 2 commits intomasterfrom
combine-prs

Conversation

@rnorth
Copy link
Member

@rnorth rnorth commented Jun 8, 2021

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 requested review from bsideup and kiview as code owners June 8, 2021 13:37
@rnorth rnorth merged commit 24610cb into master Jun 8, 2021
@rnorth rnorth deleted the combine-prs branch June 8, 2021 16:11
@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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants