Newest at the top
| 2025-07-13 14:52:38 +0200 | califax | (~califax@user/califx) (Remote host closed the connection) |
| 2025-07-13 14:48:17 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) (Ping timeout: 248 seconds) |
| 2025-07-13 14:45:58 +0200 | Frostillicus | (~Frostilli@pool-71-174-119-69.bstnma.fios.verizon.net) |
| 2025-07-13 14:43:21 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) merijn |
| 2025-07-13 14:33:12 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) (Ping timeout: 276 seconds) |
| 2025-07-13 14:31:14 +0200 | dtman34 | (~dtman34@c-73-242-68-179.hsd1.mn.comcast.net) dtman34 |
| 2025-07-13 14:30:23 +0200 | Frostillicus | (~Frostilli@pool-71-174-119-69.bstnma.fios.verizon.net) (Ping timeout: 245 seconds) |
| 2025-07-13 14:29:56 +0200 | weary-traveler | (~user@user/user363627) user363627 |
| 2025-07-13 14:27:30 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) merijn |
| 2025-07-13 14:22:32 +0200 | trickard_ | (~trickard@cpe-85-98-47-163.wireline.com.au) |
| 2025-07-13 14:20:34 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) (Ping timeout: 260 seconds) |
| 2025-07-13 14:18:24 +0200 | trickard_ | (~trickard@cpe-85-98-47-163.wireline.com.au) (Read error: Connection reset by peer) |
| 2025-07-13 14:15:12 +0200 | caubert | (~caubert@user/caubert) caubert |
| 2025-07-13 14:13:28 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) merijn |
| 2025-07-13 14:12:48 +0200 | wootehfoot | (~wootehfoo@user/wootehfoot) wootehfoot |
| 2025-07-13 14:12:31 +0200 | trickard_ | (~trickard@cpe-85-98-47-163.wireline.com.au) |
| 2025-07-13 14:12:18 +0200 | trickard | (~trickard@cpe-85-98-47-163.wireline.com.au) (Read error: Connection reset by peer) |
| 2025-07-13 14:11:47 +0200 | dtman34 | (~dtman34@2601:447:d182:6512:c2f9:c3a:b83d:6490) (Quit: ZNC 1.8.2+deb3.1+deb12u1 - https://znc.in) |
| 2025-07-13 14:05:13 +0200 | <[exa]> | anyway turns out that just cutting the source to pieces by spaces AND having a diff3 that ignores the space conflicts almost does it for me |
| 2025-07-13 14:05:13 +0200 | dtman34 | (~dtman34@2601:447:d182:6512:c2f9:c3a:b83d:6490) dtman34 |
| 2025-07-13 14:04:39 +0200 | dtman34 | (~dtman34@2601:447:d182:6512:c2f9:c3a:b83d:6490) (Quit: ZNC 1.8.2+deb3.1+deb12u1 - https://znc.in) |
| 2025-07-13 14:03:26 +0200 | caubert | (~caubert@user/caubert) (Ping timeout: 252 seconds) |
| 2025-07-13 14:02:28 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) (Ping timeout: 245 seconds) |
| 2025-07-13 13:59:06 +0200 | Frostillicus | (~Frostilli@pool-71-174-119-69.bstnma.fios.verizon.net) |
| 2025-07-13 13:57:42 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) merijn |
| 2025-07-13 13:51:05 +0200 | <[exa]> | (or if someone comments out half of the file or so) |
| 2025-07-13 13:50:54 +0200 | <[exa]> | just curious, what does it do if the source code is invalid? |
| 2025-07-13 13:50:12 +0200 | <[exa]> | maralorn: yeah if this was pure source code it would probably just do it |
| 2025-07-13 13:47:09 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) (Ping timeout: 260 seconds) |
| 2025-07-13 13:44:06 +0200 | dtman34 | (~dtman34@2601:447:d182:6512:c2f9:c3a:b83d:6490) dtman34 |
| 2025-07-13 13:41:54 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) merijn |
| 2025-07-13 13:40:27 +0200 | wootehfoot | (~wootehfoo@user/wootehfoot) (Read error: Connection reset by peer) |
| 2025-07-13 13:32:57 +0200 | <haskellbridge> | <maralorn> It might be overkill but it works great and I love that it exists |
| 2025-07-13 13:30:40 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) (Ping timeout: 244 seconds) |
| 2025-07-13 13:29:24 +0200 | humasect | (~humasect@dyn-192-249-132-90.nexicom.net) (Quit: Leaving...) |
| 2025-07-13 13:26:30 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) merijn |
| 2025-07-13 13:23:50 +0200 | gmg | (~user@user/gehmehgeh) gehmehgeh |
| 2025-07-13 13:23:25 +0200 | tromp | (~textual@2001:1c00:3487:1b00:89d3:7d92:7b20:925) |
| 2025-07-13 13:23:00 +0200 | califax | (~califax@user/califx) califx |
| 2025-07-13 13:21:42 +0200 | patri_ | (~patri@user/patri) (Ping timeout: 276 seconds) |
| 2025-07-13 13:21:24 +0200 | dtman34 | (~dtman34@2601:447:d182:6512:c2f9:c3a:b83d:6490) (Quit: ZNC 1.8.2+deb3.1+deb12u1 - https://znc.in) |
| 2025-07-13 13:19:24 +0200 | <tomsmeding> | you can't auto-merge mathematical arguments |
| 2025-07-13 13:19:16 +0200 | <tomsmeding> | "manually" as in, using formatting/reflowing/regex tools, but otherwise manually eyeballing |
| 2025-07-13 13:18:59 +0200 | <tomsmeding> | [exa]: for the TeX hypothetical you described, what I'd do is open the two side-to-side in vimdiff and manually manipulate both documents until they are at some point equal |
| 2025-07-13 13:18:00 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) (Ping timeout: 272 seconds) |
| 2025-07-13 13:17:17 +0200 | <tomsmeding> | and that there's a domain expert thoroughly checking the output of your merging process :p |
| 2025-07-13 13:16:45 +0200 | <tomsmeding> | [exa]: hope you're being paid for this |
| 2025-07-13 13:14:04 +0200 | califax | (~califax@user/califx) (Ping timeout: 244 seconds) |
| 2025-07-13 13:12:55 +0200 | merijn | (~merijn@host-vr.cgnat-g.v4.dfn.nl) merijn |
| 2025-07-13 13:11:57 +0200 | Unicorn_Princess | (~Unicorn_P@user/Unicorn-Princess/x-3540542) Unicorn_Princess |