I used CVS and ClearCase before moving into Git, and it took me some time to adjust to the fact that the cost of branching in Git is much much less than ClearCase. And getting into the “distributed” mindset didn’t happen overnight.

  • Fal@yiffit.net
    link
    fedilink
    English
    arrow-up
    16
    arrow-down
    2
    ·
    5 months ago

    Omg so this. Also merging main branches into feature branches instead of rebasing.

      • lysdexic@programming.dev
        link
        fedilink
        English
        arrow-up
        7
        ·
        5 months ago

        What is the advantage of rebasing?

        You get a cleaner history that removes noise from the run-of-the-mill commit auditing process. When you audit the history of a repo and you look into a feature branch, you do not care if in the middle of the work a developer merged with x or y branch. What you care about is what changes were made into mainline.

      • AnyOldName3@lemmy.world
        link
        fedilink
        arrow-up
        2
        ·
        5 months ago

        Instead of a commit history, you get a commit fairy tale, which is prettier than the truth, but probably less useful. You get something akin to merging the base branch into the feature branch but things look as if they were done in an order they weren’t instead of getting an ‘ugly’ merge commit.