• pivot_root@lemmy.world
    1·
    29 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
        0·
        29 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.