00:07 reportable6 left 00:09 reportable6 joined, lizmat joined 01:09 linkable6 left, notable6 left, nativecallable6 left, bloatable6 left, statisfiable6 left, releasable6 left, squashable6 left, reportable6 left, benchable6 left, quotable6 left, greppable6 left, committable6 left, unicodable6 left, tellable6 left, sourceable6 left, bisectable6 left, shareable6 left, evalable6 left, coverable6 left 01:10 shareable6 joined, benchable6 joined, quotable6 joined, linkable6 joined, bisectable6 joined, unicodable6 joined, tellable6 joined 01:11 releasable6 joined, sourceable6 joined, nativecallable6 joined, evalable6 joined, committable6 joined, squashable6 joined, greppable6 joined, coverable6 joined, reportable6 joined 01:12 notable6 joined, statisfiable6 joined, bloatable6 joined 01:53 frost joined 02:53 bloatable6 left, greppable6 left, nativecallable6 left, bisectable6 left, sourceable6 left, squashable6 left, unicodable6 left, statisfiable6 left, shareable6 left, notable6 left, reportable6 left, coverable6 left, linkable6 left, committable6 left, benchable6 left, releasable6 left, tellable6 left, quotable6 left, evalable6 left, shareable6 joined, quotable6 joined 02:54 bloatable6 joined, squashable6 joined, notable6 joined, tellable6 joined, unicodable6 joined 02:55 bisectable6 joined, committable6 joined, releasable6 joined, reportable6 joined, sourceable6 joined 02:56 nativecallable6 joined, benchable6 joined, greppable6 joined, evalable6 joined, linkable6 joined, coverable6 joined, statisfiable6 joined 04:00 quotable6 left, bloatable6 left, notable6 left, linkable6 left, shareable6 left, statisfiable6 left, reportable6 left, benchable6 left, squashable6 left, releasable6 left, sourceable6 left, unicodable6 left, tellable6 left, greppable6 left, coverable6 left, evalable6 left, bisectable6 left, tellable6 joined 04:01 shareable6 joined, bloatable6 joined, bisectable6 joined, sourceable6 joined, greppable6 joined, quotable6 joined 04:02 unicodable6 joined, benchable6 joined, reportable6 joined, linkable6 joined, statisfiable6 joined, coverable6 joined 04:03 squashable6 joined, evalable6 joined, releasable6 joined, notable6 joined 05:03 sourceable6 left, evalable6 left, squashable6 left, quotable6 left, shareable6 left, greppable6 left, unicodable6 left, coverable6 left, benchable6 left, tellable6 left, nativecallable6 left, committable6 left, notable6 left, releasable6 left, reportable6 left, bloatable6 left, bisectable6 left, statisfiable6 left, linkable6 left, bloatable6 joined, squashable6 joined 05:04 quotable6 joined, nativecallable6 joined, tellable6 joined, evalable6 joined, shareable6 joined, greppable6 joined, committable6 joined, bisectable6 joined, linkable6 joined, statisfiable6 joined 05:05 releasable6 joined, reportable6 joined, coverable6 joined, sourceable6 joined 05:06 unicodable6 joined, notable6 joined, benchable6 joined 06:00 kjp left 06:07 kjp joined, reportable6 left 06:08 kjp left 06:09 kjp joined, reportable6 joined
timo i'm having this ridiculous idea right now 06:55
we warn whenever we see merge conflict markers, right?
06:55 frost left
timo what if we offered the user a way to always take the before or always take the after path (or maybe a piece of code to make the decision on a filename/line number basis, or based on the conflict lines themselves?), so you'll end up with being able to test your code with a partially resolved merge conflict 06:56
06:57 Xliff joined 07:38 discord-raku-bot left, discord-raku-bot joined
timo has anybody recommended git imerge to y'all yet? 07:49
08:18 sena_kun joined 09:07 Kaipei joined 09:11 Kaiepi left 09:12 frost joined 09:14 Geth left, Geth joined 10:03 epony left 10:37 sena_kun left 10:38 sena_kun joined 11:50 greppable6 left, releasable6 left, coverable6 left, committable6 left, notable6 left, unicodable6 left, nativecallable6 left, linkable6 left, shareable6 left, benchable6 left, reportable6 left, bisectable6 left, evalable6 left, sourceable6 left, statisfiable6 left, bloatable6 left, squashable6 left, quotable6 left, tellable6 left 11:51 notable6 joined, evalable6 joined, tellable6 joined, statisfiable6 joined, sourceable6 joined, shareable6 joined, nativecallable6 joined 11:52 quotable6 joined, linkable6 joined, benchable6 joined, releasable6 joined 11:53 bisectable6 joined, unicodable6 joined, squashable6 joined, committable6 joined, coverable6 joined, bloatable6 joined, reportable6 joined, greppable6 joined 12:08 reportable6 left 12:09 reportable6 joined 12:52 Kaipei left 13:04 frost left 13:06 frost joined 13:12 epony joined 13:27 Kaipei joined 13:38 Kaipei left 13:39 Kaipei joined 13:41 Kaipei left 13:42 Kaipei joined 14:07 Kaiepi joined 14:08 Kaipei left, Kaiepi left 14:09 Kaiepi joined 14:23 frost left
[Coke] -1 for any more magic based on merge conflict markers; what if you have multiple instance, how do you answer the question for each one? 14:42
vrurg Agree. This is the road where we end up having a whole lot of infrastructure for different SCM built into the compiler itself. 15:02
I'd say a tool would do any kind of job like that better than a compiler would. 15:03
15:23 linkable6 left, evalable6 left 15:24 linkable6 joined 15:26 evalable6 joined
timo do different scm actually have noticeably different conflict markers? 16:00
but yeah, it's not actually important to have this %)
Voldenet it's useful to recognize that because conflict markers in heredocs are not going to be errors 16:14
perl recognizes such markers: perl -e '<<<<<<<' 16:16
> Version control conflict marker at -e line 1, near "<<<<<<<"
gcc recognizes that as well, clang doesn't 16:17
(Ok, clang recognizes only proper syntax as version control conflict marker) 16:19
16:53 sena_kun left
Voldenet this made me wonder why `<<<<<<< HEAD` in the code isn't immediately marked as a failure 16:56
17:53 linkable6 left, evalable6 left 17:55 evalable6 joined, linkable6 joined 18:05 reportable6 left 18:07 reportable6 joined 19:32 evalable6 left, linkable6 left 19:33 linkable6 joined, evalable6 joined 20:33 coverable6 left, evalable6 left, shareable6 left, quotable6 left, unicodable6 left, statisfiable6 left, notable6 left, bloatable6 left, linkable6 left, nativecallable6 left, squashable6 left, bisectable6 left, sourceable6 left, committable6 left, reportable6 left, greppable6 left, benchable6 left, releasable6 left, tellable6 left 20:34 bloatable6 joined, evalable6 joined, bisectable6 joined, quotable6 joined, committable6 joined, sourceable6 joined, tellable6 joined 20:35 shareable6 joined, reportable6 joined, benchable6 joined, nativecallable6 joined, notable6 joined, greppable6 joined 20:36 linkable6 joined, squashable6 joined, coverable6 joined 20:37 statisfiable6 joined, unicodable6 joined, releasable6 joined 21:51 Kaipei joined 21:53 lizmat_ joined 21:54 Kaiepi left 21:55 patrickb_ joined 21:57 nine_ joined 21:58 bartolin_ joined, Util_ joined, nine left 21:59 patrickb left, lizmat left, [Tux] left, bartolin left, Util left, jjatria left, patrickb_ is now known as patrickb, [Tux] joined 22:10 jjatria joined 22:35 Xliff left 23:35 sourceable6 left, bisectable6 left, committable6 left, nativecallable6 left, bloatable6 left, reportable6 left, tellable6 left, squashable6 left, linkable6 left, evalable6 left, releasable6 left, quotable6 left, notable6 left, benchable6 left, shareable6 left, greppable6 left, coverable6 left, statisfiable6 left, unicodable6 left 23:36 tellable6 joined, notable6 joined, bisectable6 joined, nativecallable6 joined, benchable6 joined, evalable6 joined, squashable6 joined, bloatable6 joined, linkable6 joined, committable6 joined 23:37 releasable6 joined, sourceable6 joined, greppable6 joined, unicodable6 joined 23:38 shareable6 joined, statisfiable6 joined, coverable6 joined, reportable6 joined, quotable6 joined