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/)G

GissaMittJobb

@ GissaMittJobb @lemmy.ml

Posts
1
Comments
347
Joined
3 yr. ago

  • YT Music vs. Tidal?

    Jump

  • No need for the likely-qualifier - it definitely won't make a difference in perceived sound quality.

    You basically need expensive gear under the right conditions and training to be able to tell. Modern audio codecs are extremely good - the main thing you will get out of lossless is more storage/data usage

  • Air traffic controllers who duck unpaid work during the gov't shutdown could be fired, Duffy warns

    Jump

  • Perhaps the most pathetic attempt at intimidation ever, from a shitstain with exactly zero leverage in the situation.

  • Trump Loses Nobel Peace Prize He Shamelessly Campaigned For

    Jump

  • Well, she is the opposition leader in Venezuela, aligned with conservative interests, so I don't know that going to war with the current Venezuelan regime will actually be a good idea.

    Not that any ideas being good or bad has ever stopped him from doing anything, but I guess it bears repeating

  • Well well well.

    Jump

  • You enable it using git config, after that it will apply to whatever frontend you're using.

  • Well well well.

    Jump

  • Depending on how structured your commits have been, it can either be very difficult to get a rebase through or a complete breeze. There are some features to make it easier - rerere being the main one I'm thinking about.

  • Well well well.

    Jump

  • What's your mental model for a Git commit, and a Git branch?

    Once I properly learned those two concepts, understanding rebases became a lot easier.

    I'll try to explain it to the best of my abilities.

    • Think of a commit being a patch - a description of how to take a particular file from one state to another
    • A branch is a list of patches to be applied in order, from the point where the branch was created until the last commit on the branch

    When you rebase a particular branch, what you're essentially doing is taking all of the commits that are currently on your branch, checking out the other branch, and then applying each of the patches in order on that new branch.

    A rebase can be cleanly applied if the premise for each commit has not changed when applied, but if the premise has changed, you get a conflict to be resolved before being able to continue the rebase.

    I mentally model a rebase a bit as a fast version of how it would look like to build the branch I was on, but on top of the branch I'm rebasing on.

  • Deleted

    Permanently Deleted

    Jump

  • Well well well.

    Jump

  • I'm guessing this is in reference to a scenario where a review of the PR has already been performed, and the rebase+force push is made to introduce new changes to the PR, possibly to address PR feedback.

    I agree that these changes should be made in separate commits, for the benefit of the reviewer.

    There are other scenarios where rebases are appropriate though, such as getting potentially incompatible changes from the main branch into the PR, and here I believe a rebase+force push is the right tool for the job.

  • Well well well.

    Jump

  • Force pushing is necessary when using rebases, and rebases are an essential tool, so you should not be afraid to force push under normal circumstances.

  • Well well well.

    Jump

  • Don't be afraid of rebases, they are an essential tool in Git.

    This particular fear can only be addressed by understanding.

  • Well well well.

    Jump

  • It's mostly for undoing a rebase or merge you're not happy with.

  • Sí más más

    Jump

  • You're missing some of the code in that snippet, because the author's markdown rendering isn't working properly.

    Specifically, it's missing #incluir <iostream>, where the <iostream>-part got treated as an HTML-tag.

  • Deleted

    Permanently Deleted

    Jump

  • The two primary muscle groups involved in manspreading

  • xkcd #3148: 100% All Achievements

    Jump

  • This makes me curious on how an any% run of university would look like. Which glitches to use in particular

  • Eric Adams drops out of New York City mayoral race

    Jump

  • I'm not saying it's likely by any means - quite the opposite. Managing to gather the voters of all those other candidates under one banner is probably not going to happen

  • Eric Adams drops out of New York City mayoral race

    Jump

  • They'd have to consolidate all other votes behind Cuomo to even have a chance, looking at the latest polling.

  • When in Rome...

    Jump

  • Everyone who plays the lottery might be a millionaire too

  • How do people in cities have fun without spending money at every turn?

    Jump

  • Det hade man kunnat tro, ja!

  • How do people in cities have fun without spending money at every turn?

    Jump

  • Fully free assuming you have some level of equipment:

    • Attend the local parkrun for a free 5k race
    • Go for a walk in the park/forest, of which my city has a plethora
    • Go for a walk in Old Town
    • If in summer, go for a swim in the lakes
    • Take a long bike ride
    • If during winter, go ice skating
    • Work out at an outdoor gym

    Pretty cheap activities:

    • Take one of the public transit boats out to the archipelago
    • Take the train somewhere
    • Check out a museum