218
Fixing CI (feddit.it)
submitted 10 months ago by to c/programmer_humor@programming.dev
26 comments fedilink hide all child comments
 
you are viewing a single comment's thread
view the rest of the comments
[–] 27 points 10 months ago (5 children)

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.

  • permalink
  • fedilink
  • source
  • hideshow 5 child comments
    •
  • [–] 15 points 10 months ago (4 children)

    --force-with-lease* 🙃

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 4 child comments
    •
  • [–] 6 points 10 months ago* (3 children)

    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.

  • permalink
  • fedilink
  • source
  • parent
  • hideshow 3 child comments
    •