• 0 Posts
  • 24 Comments
Joined 1 year ago
cake
Cake day: June 8th, 2023

help-circle






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




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





  • Hmmm…

    Looks like:

    • AMD Ryzen 7 3800X
    • on an Asus ROG STRIX B550-I
    • 32GB DDR4 @ 2666
    • 3070 RTX

    Honestly, it’s possible that I just don’t notice low framerate as I’m a product of the Atari/NES gen of console gamers; my standards may be co-opted. I’m just reporting that my experience has been positive. Fair to say though that Wayland is still hit and miss, and still is. I general avoid it and stick to x while using steam, and tinker around with it when X’s idiosyncracies bother me enough. Nvidia in general just hasn’t picked my berries like it seems to have for others. Certainly not enough to ever make me retreat to a windows install 😁


  • Really? I’m having a very dissimilar experience, and am also on Manjaro. Drivers were a peach to install and I get at least as good as performance on windows…to the extent that the dual boot has (over the years) become just a single boot. I’m even running a valve index on it - Alyx runs smooth. Built in 2019.

    TBH I’m surprised at a lot of these threads about Nvidia as it’s just been a few times that the drivers didn’t work out on an update and I had a black screen. But I’ve had almost as many breaking issues from non Nvidia related stuff in its lifetime.