Zulip Chat Archive
Stream: mathlib4
Topic: Merge-conflict bot broken?
Robin Carlier (Jun 06 2025 at 20:18):
I have been getting several false positive by the merge-conflict bot today (e.g in #25545), sometimes, removing the merge conflict tag could not be achieved by just merging master on the PR, but I also had to merge master in the dependent PRs.
When the tag was added, the post-or-update-summary-comment had a weird output in its "update merge-conflict label" runs, see e.g here, or here in an other PR. It seems a runner has a misconfigured git and it causes troubles.
cc @Bryan Gin-ge Chen
Jovan Gerbscheid (Jun 06 2025 at 20:44):
I've got the same at #25534. There is no merge conflict, but I'm getting the merge-conflict tag.
Robin Carlier (Jun 06 2025 at 21:37):
Also in #25548...
Eric Wieser (Jun 06 2025 at 23:03):
I would guess this is a git behavior change?
Bryan Gin-ge Chen (Jun 06 2025 at 23:07):
Apologies for the annoyance, everyone. There is an issue in the PR summary bot which hopefully #25547 will address.
Robin Carlier (Jun 06 2025 at 23:19):
Eric Wieser said:
I would guess this is a git behavior change?
I would be very surprised if that's the case. I think git developers have a strong policy about not introducing breaking changes in behaviour, and suddenly deciding to throw an error on something that did not used to seems unlikely.
Damiano Testa (Jun 07 2025 at 07:02):
What I thought was a patch for this issue has been merged: has anyone observed further weird behaviour with merge-conflict?
Ruben Van de Velde (Nov 04 2025 at 08:41):
It seems like #30639 didn't get a merge-conflict label automatically, does anyone want to figure out why?
Bryan Gin-ge Chen (Nov 04 2025 at 08:47):
My best guess is that the merge conflict bot ran out of tokens before it got to that PR. I think it eventually cycles through all the PRs but it might take a quite a while now.
Last updated: Dec 20 2025 at 21:32 UTC