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.

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

!!/approve on github sometimes doesn't #2965

Open
tripleee opened this issue May 7, 2019 · 5 comments
Open

!!/approve on github sometimes doesn't #2965

tripleee opened this issue May 7, 2019 · 5 comments
Labels
area: blacklists status: confirmed Confirmed as something that needs working on. type: bug Aaaah! Kill it!

Comments

@tripleee
Copy link
Member

tripleee commented May 7, 2019

What problem has occurred? What issues has it caused?

I added an !!/approve comment on several open PRs here on GitHub. Still PullApprove says "Pending: approval required by one of ...."

I deleted the failed comments and proceeded to approve from chat instead:
#2963 #2957 #2955 #2952

Weirdly, #2951 looks like it was successfully approved, but still not merged. I will proceed to merge that manually.

What would you like to happen/not happen?

Approving on Github should work just like approving from chat.

@makyen
Copy link
Contributor

makyen commented May 7, 2019

I agree that it would be nice if a !!/approve comment on GitHub did the same job of approving and merging, with resolving merge conflicts, that a !!/approve PR# does in chat. However, I've never seen it work fully the same (i.e. I've never seen it resolve the merge conflicts we typically get when another !!/watch or !!/approve has been done after the PR was created). It used to automatically merge when there were no conflicts. However, I haven't seen it do that in quite some time.

@angussidney
Copy link
Member

If I remember correctly, before !!/approve on GitHub broke, it was using a merge strategy which automatically resolves most of the normal merge conflicts that we get (as a result single-line additions). The word onion rings a bell, but I feel like that's not right (a quick search of the git docs doesn't show up any results. Octopus maybe?)

@ArtOfCode-
Copy link
Member

@double-beep metasmoke should automatically merge PRs once they're approved by PullApprove. Sounds like there's a bug there somewhere.

@iBug
Copy link
Member

iBug commented May 16, 2019

I have a feeling that Charcoal-SE/metasmoke#525 (from me) that removed the creation of .git/info/attributes on MS side might be the cause, but my Git-fu told me this .gitattributes file should always work.

@stale
Copy link

stale bot commented Nov 30, 2019

This issue has been closed because it has had no recent activity. If this is still important, please add another comment and find someone with write permissions to reopen the issue. Thank you for your contributions.

@stale stale bot closed this as completed Nov 30, 2019
@double-beep double-beep added the status: confirmed Confirmed as something that needs working on. label Dec 2, 2019
@double-beep double-beep reopened this Dec 2, 2019
@stale stale bot removed the status: stale label Dec 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: blacklists status: confirmed Confirmed as something that needs working on. type: bug Aaaah! Kill it!
Development

No branches or pull requests

6 participants