| 4 Oct 2025 |
 Grimmauld (any/all) | there it goes, CI green :) | 15:07:54 |
| Grimmauld (any/all) | now how the hell is anyone supposed to review this thing | 15:08:09 |
 Lun | yeah it gave up "Too many reviewers skipping review requests" | 15:08:24 |
 dramforever | it's not like anyone reviews the auto merges right | 15:09:13 |
| Grimmauld (any/all) | yes, but the automerge bot is also more trusted than some "random" PR | 15:09:46 |
| Lun | by trusting your diff of the conflict fix or by doing the merge locally and diffing the end result? | 15:10:01 |
 hexa | at which point I could have done the merge myself 😄 | 15:10:33 |
| Grimmauld (any/all) | like, not that i am suggesting you'd be trying anything funny, but this would be a hard-to-spot place to inject some malicious blob. | 15:11:09 |
| Lun | in order to do the merge you must first do the merge | 15:11:12 |
| Grimmauld (any/all) | yeah XD | 15:11:19 |
| hexa | the compromise is obviously to make dramforever a committer | 15:11:54 |
| Grimmauld (any/all) | Ah got it! | 15:12:33 |
| dramforever | maybe i should have made it without the merge commit | 15:12:33 |
| Grimmauld (any/all) | git show HEAD will display the diff | 15:12:41 |
| Grimmauld (any/all) | and the diff is as advertised | 15:12:54 |
| Grimmauld (any/all) | and the commits before were unchanged | 15:13:00 |
| dramforever | oh, yeah | 15:13:09 |
| dramforever | if you have it locally you can check the --cc diff | 15:13:19 |
| Lun | I verified locally that the merge result matches except fixing the conflict | 15:13:29 |
| dramforever | (which is the default for git show on merge commits) | 15:13:33 |
| Grimmauld (any/all) | that too XD | 15:14:11 |
| dramforever | why does github not have this feature | 15:14:20 |
| Lun | why does github's UI not let you view that | 15:14:23 |
| dramforever | i'm not going to do this next time | 15:15:09 |
| dramforever | this is awful | 15:15:17 |
| dramforever | next time whoever feels like doing it should probably just open a pr from the branch directly and use this https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github | 15:16:02 |
| dramforever | actually we can still make it happen now | 15:16:38 |
| dramforever | but whatever | 15:17:04 |
| Grimmauld (any/all) | anyways, its done | 15:17:07 |
| Grimmauld (any/all) | tbh i had the merge reproduced locally, so before coordinating more people with this farce, just hitting the button was easier | 15:18:41 |
