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/)JA
Posts
0
Comments
591
Joined
2 yr. ago

  • 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.

  • 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.

  • 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!)

  • 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.

  • 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.

  • Bibi, like Trump, is a symptom of the pathogen. We will need to work harder than this to cut the head off such a snake. Jail for either is positive, yes. But it's more like Tylenol for a rattlesnake bite than an actual anti venom.

  • 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.

  • I feel that too, but counter it with some good old Taoism:

    "A good person is the bad person’s teacher. A bad person is the good person’s task."

    It's ok to be the good person who sets an example, you are still making a difference. Stay motivated friend!

  • 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'"

  • 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.

  • It's the same idiotic functional equivalent of hating Antifa. Oh, we're PRO fascist are we then? Anti woke? Oh, we prefer the ignorance of unconsciousness, do we?

    They earn my mockery. Every damn day, working so fuckin' hard to be shit humans. The absolute least I can do is reward them with a good point and loud laugh.