| 11 Dec 2025 |
 tgerbet | * Yep I just rebased without thinking about it too much | 19:37:11 |
 Vladimír Čunát | I believe it was just my mistake. | 19:38:26 |
| Vladimír Čunát | I didn't wait long enough between pushing the buttons. | 19:38:34 |
| Vladimír Čunát | So it didn't turn out the way I intended. | 19:38:48 |
| Vladimír Čunát | (and I didn't notice, as the merges just succeeded) | 19:39:07 |
| Vladimír Čunát | I'll remerge to staging-nixos in a moment. | 19:42:20 |
| Vladimír Čunát | Yes, builds OK. Resolved the conflict the same way as in staging, and checked that staging-nixos will still merge cleanly with staging. | 19:43:22 |
