| 29 Nov 2023 |
 @alejandrosame:matrix.org | * meh, that's odd, my branch had the changes in a new commit and that commit didn't stay on top. I'll just remake the PR so this one can be reverted. | 15:54:55 |
 Lily Foster | In reply to @alejandrosame:matrix.org
meh, that's odd, my branch had the changes in a new commit and that commit didn't stay on top. I'll just remake the PR so this one can be reverted. is there anything to revert? | 15:55:26 |
 @julienmalka:matrix.org | In reply to @alejandrosame:matrix.org
I just did a rebase to fix the merge conflict and GitHub shows the PR as being automerged. I'm confused. Yeah github does that when the PR is empty, that's annoying | 15:56:44 |
| @julienmalka:matrix.org | You probably messed up your rebase somehow | 15:57:21 |
| @alejandrosame:matrix.org | The intention was to make it a draft for last minute feedback, it's just the release notes so not huge deal. I'm just annoyed. | 15:57:23 |
| @alejandrosame:matrix.org | They can still be ammended, I guess I'll wait for the meeting :( | 15:57:47 |
| @alejandrosame:matrix.org | * They can still be ammended, I guess I'll wait for the meeting :) | 15:57:53 |
| @julienmalka:matrix.org | The PR is empty though, nothing to revert just open another one | 15:57:55 |
| @julienmalka:matrix.org | You just merged nothing in master | 15:58:23 |
| @alejandrosame:matrix.org | ah. wth, ok | 15:58:32 |
| @julienmalka:matrix.org | And the good thing is that it counts in your github stats :p | 15:58:40 |
| @alejandrosame:matrix.org | lol | 15:58:50 |
| Lily Foster | (it also wasn't a merge? it's showing as closed to me) | 15:59:25 |
| Lily Foster | (and it says you force-pushed to a commit that was at the top of master at the time: https://github.com/NixOS/nixpkgs/commit/6b03489b6de54155c5d6cd652392f76eae53e048) | 15:59:53 |
| @julienmalka:matrix.org | In reply to @lily:lily.flowers
(it also wasn't a merge? it's showing as closed to me) Yes you are right, abuse of language | 16:00:42 |
| @alejandrosame:matrix.org | New PR: https://github.com/NixOS/nixpkgs/pull/270967 | 16:11:56 |
 figsoda | final release in < 1 hour at ttps://jitsi.lassul.us/nixos-2311 | 16:12:32 |
| figsoda | * final release in < 1 hour at https://jitsi.lassul.us/nixos-2311 | 16:12:38 |
| @alejandrosame:matrix.org | In reply to @lily:lily.flowers
(it also wasn't a merge? it's showing as closed to me) Yeah the UI really tripped me up, I really don't know what did I do wrong with the rebase, tbh. | 16:12:47 |
| Lily Foster | In reply to @alejandrosame:matrix.org
Yeah the UI really tripped me up, I really don't know what did I do wrong with the rebase, tbh. yeah, stuff just happens sometimes. it's admittedly quite easy to muck up git commands | 16:45:23 |
 lennart | I learned how to do git rebase --onto today and for this… was real stressful :D | 16:46:55 |
 Vladimír Čunát | In reply to @figsoda:matrix.org
final release in < 1 hour at https://jitsi.lassul.us/nixos-2311 Ping me if you need anything e.g. around hydra.nixos.org | 16:53:17 |
 Ilan Joselevich (Kranzes) | raitobezarius u joining? | 17:01:04 |
 raitobezarius | I am | 17:01:17 |
| lennart | alejandrosame: are you also joining? | 17:02:33 |
| lennart | would be here https://jitsi.lassul.us/nixos-2311 | 17:02:40 |
| @alejandrosame:matrix.org | in a min | 17:03:25 |
 infinisil | Release notes automation in nix: https://github.com/NixOS/nix/pull/9393 | 17:04:30 |
| figsoda | https://github.com/NixOS/nixos-homepage/pull/1173 | 19:46:15 |
| figsoda | still working on the discourse post, but the initial draft for the blog post is ready | 19:47:10 |
