• xmunk@sh.itjust.works
      link
      fedilink
      arrow-up
      4
      ·
      1 year ago

      I would’ve… but mercurial isn’t better.

      As an aside, stop merging into in-progress private branches… it makes the absolute worst conflicts.

      • steph@lemmy.clueware.org
        link
        fedilink
        arrow-up
        0
        ·
        edit-2
        1 year ago

        I’ve had that kind of reaction - on rebases also - and most times it was in fact a code smell pointing to a case of spaghetti code.

        If you get to the point that you fear upstream merges/rebases into your WIP, stop for a second and ask yourself if maybe that might be an issue with too much interpendencies inside the code itself. Code should be as close to an directed acrylic graph as possible. (doesn’t count, I was not speaking of git! :b )

  • Ilflish@lemm.ee
    link
    fedilink
    arrow-up
    2
    ·
    edit-2
    1 year ago
    • Make Structured Commits by context
    • Make a MR
    • Forgot to Rebase
    • Close MR
    • Rebase
    • Make a MR
    • Forgot to push the Rebase so now all Rebase items are on my MR
    • Close MR
    • Reset Changes
    • Push Rebased Items
    • Make Structured Commits,
    • Forget a file
    • Reset Changes
    • Make a mega Commit
    • Make a MR
    • Pipeline fails
    • aspirate2959@sh.itjust.works
      link
      fedilink
      arrow-up
      3
      ·
      1 year ago

      Which makes a new commit. The old commit before the rebase is still there until it’s garbage collected. Editing a commit in any way changes its hash, turning it into a new commit.

  • PeriodicallyPedantic@lemmy.ca
    link
    fedilink
    arrow-up
    0
    ·
    1 year ago

    I stand by my opinion that git should be the what VCS software uses internally and is built on. It’s an API for VCS developers to use. And repon admins.

    Thev actual VCS should have it’s own API and CLI that is intuitive and shouldn’t require understanding the underlying data structure.

  • ExLisper@linux.community
    link
    fedilink
    English
    arrow-up
    0
    ·
    1 year ago

    I’ve been using git for 20 years and have no idea how it works. Probably will be the next things I will do a deep dive into.