she/they, non-binary transfeminine individual based in Berlin

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

help-circle


  • How you could somewhat rebase manually (to understand the effect; or because you like to handle the merge conflicts more granular or be more selective):

    We assume we have the branch “Feat” which was started on an old version of “Main”, and now want to rebase it:

    • Rename “Feat” to “Old” (does not happen during rebase, but we kinda need it for this demonstration)
    • Create “Feat” at the newest (or wherever you want) commit of “Main”
    • Cherrypick all commits from “Old” into “Feat”

    Et viola - you kinda manually rebased “Feat” on “Main”








  • Huh?

    Soccer games are like the only* socially accepted events where you can proudly bring out a german flag without looking like a nationalist. At world championship the whole city is a sea of black-red-gold.

    I’m quite surprised.

    Tho I’m not a soccer fan and therefore don’t know how that looks abroad.

    *(hyperbolic; guess if we think more than a few seconds we could find more, nut that’s not that important of a point here)





  • Madlaine@feddit.detoAndroid@lemdro.idPhones should have 2 USB C ports
    link
    fedilink
    English
    arrow-up
    15
    arrow-down
    1
    ·
    1 year ago
    1. I never understood why space should be at premium. A phone does not need to be as thin as possible. 1½-2cm thickness is reasonable in my eyes, and would allow so much more ports and/or buttons. I would have use for 2-3 extra buttons.
    2. The biggest pro of two opposing ports: you could always charge your device regardless of orientation. With just a port on the bottom charging while scrolling in the bed is often uncomfortable