Skip to content

- adds a workflow to handle conflicting PRs automatically#410

Merged
baywet merged 2 commits intodevfrom
feature/conflict-workflow
Aug 18, 2020
Merged

- adds a workflow to handle conflicting PRs automatically#410
baywet merged 2 commits intodevfrom
feature/conflict-workflow

Conversation

@baywet
Copy link
Copy Markdown
Member

@baywet baywet commented Aug 18, 2020

Fixes #

Changes proposed in this pull request

Other links

@baywet baywet requested review from MIchaelMainer and zengin August 18, 2020 12:05
@baywet baywet self-assigned this Aug 18, 2020
@zengin
Copy link
Copy Markdown
Contributor

zengin commented Aug 18, 2020

nit: Do you mind removing the PR description template in cases like this (i.e. when the title is description)?

@baywet
Copy link
Copy Markdown
Member Author

baywet commented Aug 18, 2020

@zengin no worries, I'll try to keep that in mind for the following ones.

@baywet baywet merged commit e2afec5 into dev Aug 18, 2020
@baywet baywet deleted the feature/conflict-workflow branch August 18, 2020 18:28
@baywet baywet added this to the 1.10.0 milestone Aug 18, 2020
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.

2 participants