this post was submitted on 15 Jan 2024
433 points (97.8% liked)

Programmer Humor

19718 readers
90 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

founded 1 year ago
MODERATORS
 
you are viewing a single comment's thread
view the rest of the comments
[–] [email protected] 3 points 10 months ago (1 children)

It's all fun and games until a git push slides in between...

[–] [email protected] 4 points 10 months ago (1 children)

Always use --force, far fewer errors that way.

I also use git reset instead of merge. It keeps history more linear.

[–] [email protected] 1 points 10 months ago
  • --force-with-lease