Skip Navigation

InitialsDiceBearhttps://github.com/dicebear/dicebearhttps://creativecommons.org/publicdomain/zero/1.0/„Initials” (https://github.com/dicebear/dicebear) by „DiceBear”, licensed under „CC0 1.0” (https://creativecommons.org/publicdomain/zero/1.0/)O

oortjunk

@ jaemo @sh.itjust.works

Posts
0
Comments
612
Joined
3 yr. ago

  • Rebase Supremacy

    Jump

  • https://gitmoji.dev/

    Quasi parallel reply to your other post, this would kind of echo the want for a capital letter at the start of the commit message. Icon indicates overall topic nature of commits.

    Lets say I am adding a database migration and my commit is the migration file and the schema. My commit message might be:

     
                 🗃️ Add notes to Users table

    So anyone looking at the eventual pr will see the icon and know that this bunch of work will affect db without all that tedious "reading the code" part of the review, or for team members who didn't participate in reviews.

    I was initially hesitant to adopt it but I have very reasonable, younger team mates for whom emojis are part of the standard vocabulary. I gradually came to appreciate and value the ability to convey more context in my commits this way. I'm still guilty of the occasionally overusing:

     
               ♻️ Fix the thing

    type messages when I'm lazy; doesn't fix that bad habit, but I'm generally much happier reading mine or someone else's PR commit summary with this extra bit of context added.

  • Rebase Supremacy

    Jump

  • Could have been worse. I mean, like, imagine of you were using like CVS and you put a watch on the root! Haha and then like every trivial commit in the repo caused everyone to in the entire org to get an email and it crashed the email servers.

    Like who'd even DO that?! Though, I bet if you met that guy he'd be ok. Like not a jerk, and pretty sorry for all those emails. A cool guy.

  • Rebase Supremacy

    Jump

  • Rebase Supremacy

    Jump

  • 100% they do. Rebase is an everyday thing, merge is for PRs (for me anyway). Or merges are for regular branches if you roll that way. The only wrong answer is the one that causes you to lose commits and have to use reflog, cos....well, then you done messed up now son... (but even then hope lives on!)

  • Rebase Supremacy

    Jump

  • Here's an example

    Say I work on authentication under feature/auth Monday and get some done. Tuesday an urgent feature request for some logging work comes in and I complete it on feature/logging and merge clean to main. To make sure all my code from Monday will work, I will then switch to feature/auth and then git pull --rebase origin main. Now my auth commits start after the merge commit from the logging pr.

  • A Vigilante Hacker Took Down North Korea’s Internet. Now He’s Taking Off His Mask

    Jump

  • I'll have you know I'm fully baked, and don't have any reason not to express myself here, so naturally, I'ma gonna.

  • Rebase Supremacy

    Jump

  • Merge keeps the original timeline. Your commits go in along with anything else that happened relative to the branch you based your work off (probably main). This generates a merge commit.

    Rebase will replay all the commits that happened while you were doing your work before your commits happen, and then put yours at the HEAD, so that they are the most recent commits. You have to mitigate any conflicts that impact the same files as these commits are replayed, if any conflicts arise. These are resolved the same way any merge conflict is. There is no frivolous merge commit in this scenario.

    TlDR; End result, everything that happened to the branch minus your work, happens. Then your stuff happens after. Much tidy and clean.

  • A Vigilante Hacker Took Down North Korea’s Internet. Now He’s Taking Off His Mask

    Jump

  • No. No I'm just calling out that this particular cyberattack was not as impactful to the everyman of North Korea as it would fit any other, more modernized country. Your point gains more validity the more networked a country is.

    The article is paywalled. Did you read all of it? Does it specifically quote the author as saying "I want the same baseline response. Doesn't matter who I attack"? Because I didn't see that, but I didn't bother to bypass the paywall. If you did and it's in there, cool, guys a weirdo. If not, quit making up shit to fill out your narrative. You don't know any better than anyone else unless you asked him or are him.

  • What's your biggest scumbag move

    Jump

  • Convinced my grade 1 friend that the Elbow River in Calgary was named because it was so corrosive, a boys' elbow dissolved when he tripped and fell in. "It's also known as 'The Dissolving River'"

  • A Vigilante Hacker Took Down North Korea’s Internet. Now He’s Taking Off His Mask

    Jump

  • Are you laboring under the false impression that the average citizens of North Korea have, forget regular, but ANY access to the internet? Carpet bombing doesn't work if you're already a ghost.

  • Google might make users pay for AI features in search results

    Jump

  • It will. 5, maybe 8 years ago, google mighta gotten this one over on us, but it's way too late. I don't even trust google search results anymore, haven't used it to look up something in over a year. Maps, sure. Web search? Nahp.

  • Rebase Supremacy

    Jump

  • Fuck a merge commit! Rebase ervray day bay bayyy.

  • Ford Mustang Mach-E Sales Soar After Discounts, Proving Cheap EVs Are the Way Forward

    Jump

  • It's also the same BS excuse every lazy ICE adherent makes. "Bwaaah I needs to drive over five hundy miles a day." It's nonsense and I'm quite comfortable calling it a lie. You might want to take a 500 mile road trip. But not every day you don't ya lazy liars.

    And yes: there exist occupational life choices that lead one to a life where you might travel that distance in a single day. But in your own personal vehicle?

    Lies.

  • Woman who was held hostage by Hamas speaks out on her abduction and sexual assault

    Jump

  • I can think of much better, utilitarian arrangements for Hamas members' atoms than the current configuration. Fertilizing feedcrop for starters.

  • Qualcomm quietly demos Baldur’s Gate 3 and Control on Snapdragon X Elite laptops

    Jump

  • Haha 😂 HEY GUYS PLEASE NOTICE ME vibes all up in here. No notes; perfect.

  • Humanity will shrink in the future: 97% of countries will experience negative growth by 2100

    Jump

  • I bet the kids love you at parties 😘

  • Humanity will shrink in the future: 97% of countries will experience negative growth by 2100

    Jump

  • I genuinely think you're misreading that comment. I read this as an acknowledgement/warning of past human idiocy recurring, which, when we extrapolate from known data, is fucking likely.

    Ironically, your misinterpretation has led to your own hyperbolic reaction, so maybe this is about self-pity.

  • CSS

    Jump

  • Somehow I doubt a lot of these opinions are steeped in the experience of building an HTML layout using tables, transparent gifs and inline width attributes. Shit was wild before CSS.

  • Users ditch Glassdoor, stunned by site adding real names without consent

    Jump

  • Ok, but if your expectations are permanent nerfed you're gonna be a much easier mark... Plus tacit acceptance of a shitty status quo is pretty self-defeating.