Time Nick Message 00:18 MTDiscord And its not even very proprietary 04:41 MTDiscord OK, finally rebuilt my personal site in vanilla HTML, I was getting anxious about that. Only mentioning it because now I have the skills to work on the stylesheet for this, and I'll continue chipping away at the spell-check issues as well. Obv with Xmas my availability will be spotty but I'm officially done working for the year and excited about this project, so hopefully I can find the time! Not tonight though, calling it for the 04:41 MTDiscord day 🙂 11:08 MTDiscord merging https://github.com/minetest/dev.luanti.org/pull/98 in 5m 12:31 MTDiscord merging PR 99 in 5m 16:23 MTDiscord i say we conditionally merge https://github.com/minetest/dev.luanti.org/pull/93, on the condition it may be changed/reverted/etc in the future. it should be easy enough to throw a :not([alt*="fullscreen:"]) on the end of the selector or something if needed. thoughts? 16:25 MTDiscord I pulled the change locally and looked at some other pages with images and such and I don't think it's that bad of a change 16:25 MTDiscord I'd say merge it, and if there's a page with images that it will not work well with we'll see when that page exists 16:27 MTDiscord merging PR 💯 (https://github.com/minetest/dev.luanti.org/pull/100) in 5m 16:28 MTDiscord merging https://github.com/minetest/dev.luanti.org/pull/93 in 5 then 16:31 MTDiscord (ROllerozxa: please don't squash :) 16:32 MTDiscord unfortunately all other merge options are disabled... 16:32 MTDiscord everything is squashed 16:35 MTDiscord really should be splitting things into seperate prs if you care 16:35 MTDiscord it's a bit more convenient to do a NOSQUASH PR that simply gets rebase merged than making individual PRs for everything though 16:36 MTDiscord I really would like it to be possible to have PRs we can merge without squashing, especially if we're going to be pushing everything through PRs in the future 16:36 MTDiscord [nosq] PRs are such a lovely thing to have 16:36 MTDiscord I wouldn't worry about squash vs nonsquash, the git history is there in the commit list in each PR and reverts are probably gonna be very rare and don't need to be picked apart too much 16:36 MTDiscord quoting sfan5 16:36 MTDiscord > sorry for the wild collection but I'm not going to create fifteen PRs. 16:36 MTDiscord https://github.com/minetest/minetest/pull/12378 16:36 MTDiscord What does nosq mean? 16:37 MTDiscord "no squash" 16:37 MTDiscord What is the value in nosq PRs? 16:37 MTDiscord you shouldn't need to rely on people to keep their fork branches - usually they are deleted after merge and if we move the repo to another forge then all PRs associated with github forks will be gone and all that is left is the git history as we have merged 16:38 MTDiscord my point is in docs, how often are people really going to do 15 different things that are that trival? 16:38 MTDiscord well yeah that is fair 16:38 MTDiscord Agreed, I don't rely on others keeping their forks. Stepping back, how important is it that we keep such a granular git history? 16:40 MTDiscord i think if we see this being a multi person common thing, then yeah can re enable it. but for one ofs, just making another pr is 🤷 16:41 MTDiscord for context the odds are 1/108 or 0.925925925% 16:42 MTDiscord where did you get that number...? 16:42 MTDiscord oh, total commits to the repo 16:44 MTDiscord well that is because I have been a good boy and PR everything as discretely [sic] as possible even though some of them could have been one [nosq] PR of stuff I had been working on at once 16:44 MTDiscord https://cdn.discordapp.com/attachments/926231483155378176/1320431721673523290/image.png?ex=6769935e&is=676841de&hm=8b988aba36b9341cec55baa026de276e8c1b02bb27a5ace1285467eafc06ad4c& 16:44 MTDiscord Sorry, why do we want nosq again? 16:45 MTDiscord Why and when, I guess 16:45 MTDiscord well I guess it depends on how good we want the commit history to be if it needs to be looked back upon 16:45 MTDiscord I want this because it allows me to be lazy: I can add unrelated trivial/obvious changes to a PR without having bad Git history in the end 16:47 MTDiscord fwiw #94 #91 #81 #98 would have been candidates for not squashing too 16:47 MTDiscord but it's not a big problem, I can live without too :) 16:48 MTDiscord yeah if we're in agreement that keeping the git history to discrete changes isn't necessary and we can be fast and loose with it then it wouldn't be an issue for me either 16:50 MTDiscord If I make a PR to add Prettier, put all existing content through Prettier and add CI now, would it be accepted? 16:54 MTDiscord where in settings are you supposed to adjust merge options? 16:55 MTDiscord also i should be able to disable this, right? 16:55 MTDiscord https://cdn.discordapp.com/attachments/926231483155378176/1320434478174175314/image.png?ex=676995f0&is=67684470&hm=7ffeffa774834c62c80f11f5384050fd3975263b6d2aa91aca588638d15556c4& 16:56 MTDiscord found it, do we want to try enabling it? 16:56 MTDiscord https://cdn.discordapp.com/attachments/926231483155378176/1320434758383046818/image.png?ex=67699632&is=676844b2&hm=365d27dbef07dec93f2eab87ebd06c82f6be1b295cb86b6de271f5d25ec59e12& 17:05 MTDiscord eh, why not. ive enabled it for "experimental" purposes lets say 17:05 MTDiscord do the usual [no sq]: in titles or whatever 17:05 MTDiscord let revisit this in like i dunno a week or two to see how much its used? 17:12 MTDiscord roller: reminder to check things off https://github.com/minetest/dev.luanti.org/issues/15 when merging migration prs 17:15 MTDiscord I would love that, but maybe start with a few files so we can discuss formatting options 17:15 MTDiscord I only allow squash mergjng but I use the PR title as commit message, that's industry standard and I have no idea why it isn't default 17:16 MTDiscord We can also add "works on #15" to the PR description for easy linking 🙂 17:16 MTDiscord will do 👍 I ended up checking off the node pages I had migrated through the Nodes page after I did that 17:17 MTDiscord Yeah, in my 4 years at Microsoft we've never needed anything more than a commit title to know what to look for, I think squash vs no-squash is splitting hairs if that's the core goal 17:18 MTDiscord How does squashing slow you down? 17:23 MTDiscord ? It doesn't. But if I cared about the resulting Git history and created separate PRs to avoid my commits being squashed, that would slow me down. 17:24 MTDiscord (I didn't so far, and as ROllerozxa said, we don't necessarily need to care about the Git history) 17:38 webchattester I wonder whether this works 17:38 MTDiscord wild 17:39 MTDiscord no 17:39 wsor4035 left already 17:40 MTDiscord (that was me, I found a webchat link on the IRC wiki page) 17:40 MTDiscord ah 17:40 MTDiscord yeah libera's web chat should still be functional, but -dev would need you to register before you can speak iirc