cross-posted from: https://lemmy.sdf.org/post/1352760

Was digging through a project at work today where some guy in 2014 made 100+ commits in a single day and the only one that had a comment said “upgrading to v4.0”.

  • canpolat@programming.devOPM
    link
    fedilink
    English
    arrow-up
    4
    ·
    1 year ago

    Maybe my explanation was complicated, but what I describe is not time consuming. It takes at most a few minutes to do all of the things I mentioned. The difficult part is discipline of keeping refactoring separate. Once that’s done, the rest is trivial. And not all work include refactoring. That’s even easier then.

    • nittiyh@lemmy.world
      link
      fedilink
      English
      arrow-up
      2
      ·
      1 year ago

      Discipline is definitely tough. I have tried looking at rebasing tutorials and it always looked pretty tedious to do, hence my comment about time constraints. I should really give it another try though.

      • canpolat@programming.devOPM
        link
        fedilink
        English
        arrow-up
        1
        ·
        1 year ago

        Interactive rebase is used to organize (squash, drop, reorder) commits and with some experience is totally painless. Would definitely recommend watching a few videos about it.