| 4 Oct 2025 |
 Lun | in order to do the merge you must first do the merge | 15:11:12 |
 Grimmauld (migrated to @grimmauld:m.grimmauld.de) | yeah XD | 15:11:19 |
 hexa | the compromise is obviously to make dramforever a committer | 15:11:54 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | Ah got it! | 15:12:33 |
 dramforever | maybe i should have made it without the merge commit | 15:12:33 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | git show HEAD will display the diff | 15:12:41 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | and the diff is as advertised | 15:12:54 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | 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 (migrated to @grimmauld:m.grimmauld.de) | 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 (migrated to @grimmauld:m.grimmauld.de) | anyways, its done | 15:17:07 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | tbh i had the merge reproduced locally, so before coordinating more people with this farce, just hitting the button was easier | 15:18:41 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | * tbh i had the merge reproduced and checked locally, so before coordinating more people with this farce, just hitting the button was easier | 15:18:48 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | but yeah no, next time should be once you have commit bit | 15:19:13 |
| dramforever | maybe we can make the bot open a pr when automerge fails | 15:19:33 |
| dramforever | or pester github (and other competing git forges as well) to implement showing combined diffs | 15:20:42 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | tbh its the same 5-10 people that always run staging, and basically all (except you) are committers | 15:20:57 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | its rare anyone not Alyssa, k900, emily, hexa or vcunat do these merges at all | 15:21:24 |
| dramforever | i know why now | 15:21:56 |
| hexa | emily, you know, the one from the council of emilys | 15:22:18 |
