| 3 Nov 2025 |
 StepBroBD | i saw K900 pining someone doing ocaml | 12:16:04 |
| StepBroBD | did i mess smth up lmfao | 12:16:26 |
 K900 | Yes | 12:16:35 |
 Grimmauld (any/all) | https://github.com/NixOS/nixpkgs/blob/90dec067d09ee9b02f817063f480b395ba81039e/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix#L17-L32
(this would be what we have on master, basically) | 12:16:41 |
| K900 | Not really | 12:16:57 |
| K900 | Merge conflicts on staging are not uncommon | 12:16:58 |
| K900 | But with this particular instance I have no idea what the correct resolution looks like | 12:17:10 |
| StepBroBD | i guess its due to staging next dont have what we have on master right? | 12:17:34 |
| K900 | The other way around usually | 12:17:43 |
| K900 | staging-next has more things than master | 12:17:49 |
| K900 | And master is automatically merged into it every few hours | 12:17:56 |
| K900 | In this case, https://github.com/NixOS/nixpkgs/commit/1e1cef625b2108f3d3cab7fb6daff2fe62233243 | 12:18:31 |
| Grimmauld (any/all) | Its a conflict between https://github.com/NixOS/nixpkgs/commit/89fd9025cfae7cab49ea36134640952ad553c4fa and https://github.com/NixOS/nixpkgs/commit/1e1cef625b2108f3d3cab7fb6daff2fe62233243 | 12:18:35 |
| StepBroBD | "data race" i guess
the easiest way would be me reverting and re-create the same pr after staging-next workflow? | 12:18:39 |
| K900 | No | 12:18:45 |
| K900 | The easiest way is to tell me how to resolve the conflict and I'll do it manually and push | 12:19:02 |
| StepBroBD | keep ocamlformat 0.28 | 12:20:08 |
| StepBroBD | should be that ez | 12:20:15 |
| K900 | It's not the version that's conflicting | 12:20:26 |
| K900 | ^ | 12:20:31 |
| K900 | I think the correct resolution is to move the newly added version check down to meta.broken as Jo did in their big commit | 12:21:02 |
| Grimmauld (any/all) | Can't we just cherry-pick https://github.com/NixOS/nixpkgs/commit/89fd9025cfae7cab49ea36134640952ad553c4fa to staging-next individually and then accept the staging-next version explicitly for the conflicting files? | 12:21:04 |
| K900 | And the rest already applies cleanly | 12:21:47 |
| K900 | https://github.com/NixOS/nixpkgs/commit/89fd9025cfae7cab49ea36134640952ad553c4fa#diff-87747fec8c7dfe5d924b47da9425f32fdc332203161b00ff7f754389d86b66be is the only change that doesn't | 12:22:06 |
| StepBroBD | problem solved? | 12:22:23 |
| StepBroBD | scared me for a bit | 12:22:30 |
| K900 | Well the problem will be solved if you agree this is the correct thing to do | 12:22:49 |
| K900 | And then I can just commit and push it | 12:22:54 |
| StepBroBD | yes | 12:23:01 |
| K900 | OK cool | 12:23:05 |
