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

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

Merged
merged 2 commits into from
Mar 16, 2021
Merged

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

merged 2 commits into from
Mar 16, 2021

Conversation

attaradev
Copy link
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 approved these changes Mar 16, 2021
View reviewed changes
Copy link
Contributor

@robertjchen robertjchen left a comment

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.
Reviewers

@robertjchen robertjchen robertjchen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
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
@attaradev @robertjchen