[00:07] *** reportable6 left [00:09] *** reportable6 joined [00:09] *** lizmat joined [01:09] *** linkable6 left [01:09] *** notable6 left [01:09] *** nativecallable6 left [01:09] *** bloatable6 left [01:09] *** statisfiable6 left [01:09] *** releasable6 left [01:09] *** squashable6 left [01:09] *** reportable6 left [01:09] *** benchable6 left [01:09] *** quotable6 left [01:09] *** greppable6 left [01:09] *** committable6 left [01:09] *** unicodable6 left [01:09] *** tellable6 left [01:09] *** sourceable6 left [01:09] *** bisectable6 left [01:09] *** shareable6 left [01:09] *** evalable6 left [01:09] *** coverable6 left [01:10] *** shareable6 joined [01:10] *** benchable6 joined [01:10] *** quotable6 joined [01:10] *** linkable6 joined [01:10] *** bisectable6 joined [01:10] *** unicodable6 joined [01:10] *** tellable6 joined [01:11] *** releasable6 joined [01:11] *** sourceable6 joined [01:11] *** nativecallable6 joined [01:11] *** evalable6 joined [01:11] *** committable6 joined [01:11] *** squashable6 joined [01:11] *** greppable6 joined [01:11] *** coverable6 joined [01:11] *** reportable6 joined [01:12] *** notable6 joined [01:12] *** statisfiable6 joined [01:12] *** bloatable6 joined [01:53] *** frost joined [02:53] *** bloatable6 left [02:53] *** greppable6 left [02:53] *** nativecallable6 left [02:53] *** bisectable6 left [02:53] *** sourceable6 left [02:53] *** squashable6 left [02:53] *** unicodable6 left [02:53] *** statisfiable6 left [02:53] *** shareable6 left [02:53] *** notable6 left [02:53] *** reportable6 left [02:53] *** coverable6 left [02:53] *** linkable6 left [02:53] *** committable6 left [02:53] *** benchable6 left [02:53] *** releasable6 left [02:53] *** tellable6 left [02:53] *** quotable6 left [02:53] *** evalable6 left [02:53] *** shareable6 joined [02:53] *** quotable6 joined [02:54] *** bloatable6 joined [02:54] *** squashable6 joined [02:54] *** notable6 joined [02:54] *** tellable6 joined [02:54] *** unicodable6 joined [02:55] *** bisectable6 joined [02:55] *** committable6 joined [02:55] *** releasable6 joined [02:55] *** reportable6 joined [02:55] *** sourceable6 joined [02:56] *** nativecallable6 joined [02:56] *** benchable6 joined [02:56] *** greppable6 joined [02:56] *** evalable6 joined [02:56] *** linkable6 joined [02:56] *** coverable6 joined [02:56] *** statisfiable6 joined [04:00] *** quotable6 left [04:00] *** bloatable6 left [04:00] *** notable6 left [04:00] *** linkable6 left [04:00] *** shareable6 left [04:00] *** statisfiable6 left [04:00] *** reportable6 left [04:00] *** benchable6 left [04:00] *** squashable6 left [04:00] *** releasable6 left [04:00] *** sourceable6 left [04:00] *** unicodable6 left [04:00] *** tellable6 left [04:00] *** greppable6 left [04:00] *** coverable6 left [04:00] *** evalable6 left [04:00] *** bisectable6 left [04:00] *** tellable6 joined [04:01] *** shareable6 joined [04:01] *** bloatable6 joined [04:01] *** bisectable6 joined [04:01] *** sourceable6 joined [04:01] *** greppable6 joined [04:01] *** quotable6 joined [04:02] *** unicodable6 joined [04:02] *** benchable6 joined [04:02] *** reportable6 joined [04:02] *** linkable6 joined [04:02] *** statisfiable6 joined [04:02] *** coverable6 joined [04:03] *** squashable6 joined [04:03] *** evalable6 joined [04:03] *** releasable6 joined [04:03] *** notable6 joined [05:03] *** sourceable6 left [05:03] *** evalable6 left [05:03] *** squashable6 left [05:03] *** quotable6 left [05:03] *** shareable6 left [05:03] *** greppable6 left [05:03] *** unicodable6 left [05:03] *** coverable6 left [05:03] *** benchable6 left [05:03] *** tellable6 left [05:03] *** nativecallable6 left [05:03] *** committable6 left [05:03] *** notable6 left [05:03] *** releasable6 left [05:03] *** reportable6 left [05:03] *** bloatable6 left [05:03] *** bisectable6 left [05:03] *** statisfiable6 left [05:03] *** linkable6 left [05:03] *** bloatable6 joined [05:03] *** squashable6 joined [05:04] *** quotable6 joined [05:04] *** nativecallable6 joined [05:04] *** tellable6 joined [05:04] *** evalable6 joined [05:04] *** shareable6 joined [05:04] *** greppable6 joined [05:04] *** committable6 joined [05:04] *** bisectable6 joined [05:04] *** linkable6 joined [05:04] *** statisfiable6 joined [05:05] *** releasable6 joined [05:05] *** reportable6 joined [05:05] *** coverable6 joined [05:05] *** sourceable6 joined [05:06] *** unicodable6 joined [05:06] *** notable6 joined [05:06] *** benchable6 joined [06:00] *** kjp left [06:07] *** kjp joined [06:07] *** reportable6 left [06:08] *** kjp left [06:09] *** kjp joined [06:09] *** reportable6 joined [06:55] i'm having this ridiculous idea right now [06:55] we warn whenever we see merge conflict markers, right? [06:55] *** frost left [06:56] 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:57] *** Xliff joined [07:38] *** discord-raku-bot left [07:38] *** discord-raku-bot joined [07:49] has anybody recommended git imerge to y'all yet? [08:18] *** sena_kun joined [09:07] *** Kaipei joined [09:11] *** Kaiepi left [09:12] *** frost joined [09:14] *** Geth left [09:14] *** Geth joined [10:03] *** epony left [10:37] *** sena_kun left [10:38] *** sena_kun joined [11:50] *** greppable6 left [11:50] *** releasable6 left [11:50] *** coverable6 left [11:50] *** committable6 left [11:50] *** notable6 left [11:50] *** unicodable6 left [11:50] *** nativecallable6 left [11:50] *** linkable6 left [11:50] *** shareable6 left [11:50] *** benchable6 left [11:50] *** reportable6 left [11:50] *** bisectable6 left [11:50] *** evalable6 left [11:50] *** sourceable6 left [11:50] *** statisfiable6 left [11:50] *** bloatable6 left [11:50] *** squashable6 left [11:50] *** quotable6 left [11:50] *** tellable6 left [11:51] *** notable6 joined [11:51] *** evalable6 joined [11:51] *** tellable6 joined [11:51] *** statisfiable6 joined [11:51] *** sourceable6 joined [11:51] *** shareable6 joined [11:51] *** nativecallable6 joined [11:52] *** quotable6 joined [11:52] *** linkable6 joined [11:52] *** benchable6 joined [11:52] *** releasable6 joined [11:53] *** bisectable6 joined [11:53] *** unicodable6 joined [11:53] *** squashable6 joined [11:53] *** committable6 joined [11:53] *** coverable6 joined [11:53] *** bloatable6 joined [11:53] *** reportable6 joined [11:53] *** 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 [14:08] *** Kaiepi left [14:09] *** Kaiepi joined [14:23] *** frost left [14:42] <[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? [15:02] Agree. This is the road where we end up having a whole lot of infrastructure for different SCM built into the compiler itself. [15:03] I'd say a tool would do any kind of job like that better than a compiler would. [15:23] *** linkable6 left [15:23] *** evalable6 left [15:24] *** linkable6 joined [15:26] *** evalable6 joined [16:00] do different scm actually have noticeably different conflict markers? [16:00] but yeah, it's not actually important to have this %) [16:14] it's useful to recognize that because conflict markers in heredocs are not going to be errors [16:16] perl recognizes such markers: perl -e '<<<<<<<' [16:16] > Version control conflict marker at -e line 1, near "<<<<<<<" [16:17] gcc recognizes that as well, clang doesn't [16:19] (Ok, clang recognizes only proper syntax as version control conflict marker) [16:53] *** sena_kun left [16:56] this made me wonder why `<<<<<<< HEAD` in the code isn't immediately marked as a failure [17:53] *** linkable6 left [17:53] *** evalable6 left [17:55] *** evalable6 joined [17:55] *** linkable6 joined [18:05] *** reportable6 left [18:07] *** reportable6 joined [19:32] *** evalable6 left [19:32] *** linkable6 left [19:33] *** linkable6 joined [19:33] *** evalable6 joined [20:33] *** coverable6 left [20:33] *** evalable6 left [20:33] *** shareable6 left [20:33] *** quotable6 left [20:33] *** unicodable6 left [20:33] *** statisfiable6 left [20:33] *** notable6 left [20:33] *** bloatable6 left [20:33] *** linkable6 left [20:33] *** nativecallable6 left [20:33] *** squashable6 left [20:33] *** bisectable6 left [20:33] *** sourceable6 left [20:33] *** committable6 left [20:33] *** reportable6 left [20:33] *** greppable6 left [20:33] *** benchable6 left [20:33] *** releasable6 left [20:33] *** tellable6 left [20:34] *** bloatable6 joined [20:34] *** evalable6 joined [20:34] *** bisectable6 joined [20:34] *** quotable6 joined [20:34] *** committable6 joined [20:34] *** sourceable6 joined [20:34] *** tellable6 joined [20:35] *** shareable6 joined [20:35] *** reportable6 joined [20:35] *** benchable6 joined [20:35] *** nativecallable6 joined [20:35] *** notable6 joined [20:35] *** greppable6 joined [20:36] *** linkable6 joined [20:36] *** squashable6 joined [20:36] *** coverable6 joined [20:37] *** statisfiable6 joined [20:37] *** unicodable6 joined [20:37] *** 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 [21:58] *** Util_ joined [21:58] *** nine left [21:59] *** patrickb left [21:59] *** lizmat left [21:59] *** [Tux] left [21:59] *** bartolin left [21:59] *** Util left [21:59] *** jjatria left [21:59] *** patrickb_ is now known as patrickb [21:59] *** [Tux] joined [22:10] *** jjatria joined [22:35] *** Xliff left [23:35] *** sourceable6 left [23:35] *** bisectable6 left [23:35] *** committable6 left [23:35] *** nativecallable6 left [23:35] *** bloatable6 left [23:35] *** reportable6 left [23:35] *** tellable6 left [23:35] *** squashable6 left [23:35] *** linkable6 left [23:35] *** evalable6 left [23:35] *** releasable6 left [23:35] *** quotable6 left [23:35] *** notable6 left [23:35] *** benchable6 left [23:35] *** shareable6 left [23:35] *** greppable6 left [23:35] *** coverable6 left [23:35] *** statisfiable6 left [23:35] *** unicodable6 left [23:36] *** tellable6 joined [23:36] *** notable6 joined [23:36] *** bisectable6 joined [23:36] *** nativecallable6 joined [23:36] *** benchable6 joined [23:36] *** evalable6 joined [23:36] *** squashable6 joined [23:36] *** bloatable6 joined [23:36] *** linkable6 joined [23:36] *** committable6 joined [23:37] *** releasable6 joined [23:37] *** sourceable6 joined [23:37] *** greppable6 joined [23:37] *** unicodable6 joined [23:38] *** shareable6 joined [23:38] *** statisfiable6 joined [23:38] *** coverable6 joined [23:38] *** reportable6 joined [23:38] *** quotable6 joined