• magic_lobster_party@kbin.run
    link
    fedilink
    arrow-up
    6
    arrow-down
    3
    ·
    edit-2
    7 months ago

    At my company we just use a squash policy in gitlab. Every merge request becomes a single commit to the main branch. Super easy to read the commit log because all commits are descriptive instead of a bunch of “fix MR comments” or “fix pipeline errors”.

    Another advice: git reset [commit-id] followed with a git commit -a is a quick way to squash all your commits.

    • bort@sopuli.xyz
      link
      fedilink
      arrow-up
      2
      ·
      7 months ago

      Another advice …quick way to squash all your commits

      in your IDE select the commits you want to squash. Then rightclick. Then “squash”. All done.

        • bort@sopuli.xyz
          link
          fedilink
          arrow-up
          3
          ·
          7 months ago

          I use like 3 of the git-feature from intellij (out of 100 or so). But these 3 features save me a lot of time.

          (the other 2 being the 3-way-merge-view and the commit-view where I can select changes for staging)