| 20 Oct 2024 |
 Artturin | Thanks | 19:25:41 |
| Artturin | This was the conflict
<<<<<<< HEAD
pythonRelaxDeps = [
"agate"
"protobuf"
];
||||||| 632fcb59da0b
pythonRelaxDeps = [ "agate" ];
=======
pythonRelaxDeps = [
"protobuf"
"agate"
];
>>>>>>> master
and I'm pretty sure I didn't see any red from duplicated attributes from the lsp, Idk what happened.
| 19:27:34 |
 K900 | That's because it wasn't that conflict | 19:28:21 |
| K900 | It was just two additions with different ordering | 19:28:31 |
| K900 | That git merged "correctly" | 19:28:34 |
| Artturin | Okay then, I didn't remember the exact file I resolved. | 19:29:06 |
| K900 | Like if you have
+foo
bar
And
bar
+foo
as two commits | 19:29:09 |
| K900 | It will automerge to
foo
bar
foo
| 19:29:21 |
 Vladimír Čunát | Yes. man git
git - the stupid content tracker
| 19:53:59 |
| Vladimír Čunát | (to be fair, this stuff is really hard, I believe) | 19:54:20 |
| K900 | Yeah you can't do it correctly without knowing language semantics | 19:54:40 |
 Fabián Heredia | Even knowing language semantics is not enough, the element being added could make sense in two separate commits and being added together like this example. | 20:22:43 |
| K900 | Well for some languages like Nix it would make sense to deduplicate completely identical definitions like these | 20:23:14 |
| K900 | And merge conflict otherwise | 20:23:18 |
| K900 | But it's definitely not possible to get correctly in all cases | 20:23:25 |
| 21 Oct 2024 |
 emily | can someone restart nixpkgs:staging-next:python312Packages.jaraco-functools.x86_64-darwin, it's a silly flaky test and blocking stuff | 04:44:22 |
| emily | (how much of an initiation ritual do I need to go through to get Hydra job restarting powers? 😅) | 04:45:08 |
| Fabián Heredia | In reply to @emilazy:matrix.org
can someone restart nixpkgs:staging-next:python312Packages.jaraco-functools.x86_64-darwin, it's a silly flaky test and blocking stuff looking into that if no-one has yet | 05:38:06 |
| Fabián Heredia | In reply to @emilazy:matrix.org
(how much of an initiation ritual do I need to go through to get Hydra job restarting powers? 😅) i asked for that over #infra:nixos.org which is the channel that covers the particular instance of hydra that powers nixos/nixpkgs. | 05:39:23 |
| Fabián Heredia | In reply to @fabianhjr:matrix.org
looking into that if no-one has yet restarted the jaraco-functools failed jobs (3) | 05:40:28 |
| Vladimír Čunát | In reply to @emilazy:matrix.org
(how much of an initiation ritual do I need to go through to get Hydra job restarting powers? 😅) Do you have a Hydra.nixos.org account? I fail to see it. | 06:33:59 |
| emily | I don't :) | 06:34:18 |
| emily | but I can fix that. | 06:34:19 |
| emily | I see "Sign in with a Hydra account" but no corresponding registration – I guess local accounts are legacy and I should be using GitHub auth? | 06:34:42 |
| Vladimír Čunát | I'm not sure 😅 | 06:36:11 |
| Vladimír Čunát | GitHub and Google accounts should work, though. | 06:36:28 |
| emily | looks like I have an account under hello@emily.moe now (and annoyingly can't adjust the email address) | 06:37:14 |
 hexa | (same issue here with the github default email....) | 11:20:59 |
|  Scrumplex joined the room. | 12:50:41 |
| Vladimír Čunát | We have a problem. A merge from master to staging-next caused to rebuild darwin stdenvs. | 13:11:04 |
