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

Warn before allowing an approve command if the PR would result in a conflict #4873

Open
gparyani opened this issue Sep 19, 2020 · 0 comments
Open

Warn before allowing an approve command if the PR would result in a conflict #4873

gparyani opened this issue Sep 19, 2020 · 0 comments
Labels
area: commands status: confirmed Confirmed as something that needs working on. type: feature request Shinies.

Comments

@gparyani
Copy link
Contributor

One of my previous PRs to watch a keyword (#4183) was approved in chat, but that same keyword had already been watched through another watch keyword before it was approved in chat, so another PR (#4184) was required to fix the conflict.

It seems the !!/approve command in chat doesn't properly recognize conflicts in the files, and goes and merges them without regard to them.

Can that command please check for conflicts and refuse to merge a PR if there is a conflict, unless a special switch (e.g. !!/approve-force) is used?
@Charcoal-SE Charcoal-SE deleted a comment Sep 26, 2020
@Spevacus Spevacus added the status: confirmed Confirmed as something that needs working on. label Oct 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
area: commands status: confirmed Confirmed as something that needs working on. type: feature request Shinies.
Milestone
No milestone
Development

No branches or pull requests
3 participants
@gparyani @double-beep @Spevacus