• pivot_root@lemmy.world
    link
    fedilink
    arrow-up
    3
    ·
    20 days ago

    Solution:

    git commit --amend
    git push --force
    

    Problem:

    The process of discovering best practices on how to keep a clean git history is a goddamned challenge.

      • pivot_root@lemmy.world
        link
        fedilink
        arrow-up
        1
        ·
        edit-2
        20 days ago

        I didn’t want to make it sound too scary 😉

        Seriously, though, git really needs an option to treat --force as --force-with-lease. In the exceedingly rare occasion where I might want to completely overwrite a branch, it should be extra explicit by having to type something like --force-and-overwrite.

    • TechNom (nobody)@programming.dev
      link
      fedilink
      English
      arrow-up
      1
      ·
      19 days ago

      I find it infuriating that they didn’t design CI to run locally first and then offer a hosted version of it. These tools are not the perfect alternatives for the real thing.