Programmer Humor

28609 readers

1609 users here now

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

Keep content in english
No advertisements
Posts must be related to programming or programmer topics

founded 2 years ago

MODERATORS

anzo@programming.dev

Feyter@programming.dev

BurningTurtle@programming.dev

pylapp@programming.dev

232

Fixing CI (feddit.it)

submitted 2 weeks ago by pewpew@feddit.it 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

[–] pivot_root@lemmy.world 32 points 2 weeks ago (1 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.

[–] Ephera@lemmy.ml 18 points 2 weeks ago (1 children)

--force-with-lease* 🙃

[–] pivot_root@lemmy.world 7 points 2 weeks ago* (last edited 2 weeks ago) (2 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.

[–] somerandomperson@lemmy.dbzer0.com 4 points 2 weeks ago (1 children)

--force-overwrite-everything-i-know-what-the-heck-i-am-doing
just to be sure... (/j)

[–] technom@programming.dev 3 points 2 weeks ago

At this point, it may be a good idea to throw the entire git porcelain (frontend) away and redesign it from scratch!

[–] Ephera@lemmy.ml 3 points 2 weeks ago

Yeah, I virtually only use --force for moving tags around (which one could definitely argue isn't really a thing you should be doing regularly either)...