Skip to content

Request manual review of automerge PR if there is a merge conflict - #1787

Merged
robertjchen merged 2 commits into
Expensify:masterfrom
attaradev:master
Mar 16, 2021
Merged

robertjchen merged 2 commits into
Expensify:masterfrom
attaradev:master

Conversation

@attaradev

Copy link
Copy Markdown
Contributor

Details

Prevent automerge PRs from getting merged automatically when they have merge conflicts

Fixed Issues

Fixes #1709

@attaradev
attaradev requested a review from a team as a code owner March 16, 2021 04:21
@botify
botify requested review from robertjchen and removed request for a team March 16, 2021 04:21
@attaradev attaradev changed the title add check for mergeability Request manual review of automerge PR if there is a merge conflict Mar 16, 2021

@robertjchen robertjchen left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for the changes, these look good to me 👍

@robertjchen
robertjchen merged commit 9fec61f into Expensify:master Mar 16, 2021
@github-actions github-actions Bot locked and limited conversation to collaborators Mar 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[GH Actions] Request review of automerge PR if there is a merge conflict

2 participants