Yeah learned this the hard way.

  • smiletolerantly@awful.systems
    link
    fedilink
    arrow-up
    7
    ·
    2 months ago

    Same. And even if you were to fuck up, have people never heard of the reflog…?

    Every job I’ve worked at it’s been the expectation to regularly rebase your feature branch on main, to squash your commits (and then force push, obv), and for most projects to do rebase-merges of PRs rather than creating merge commits. Even the, uh, less gifted developers never had an issue with this.

    I think people just hear the meme about git being hard somewhere and then use that as an excuse to never learn.

    • Eiri@lemmy.ca
      link
      fedilink
      arrow-up
      1
      ·
      2 months ago

      Why would you want to squash? Feels weird to willingly give up history granularity…