788

When you screw up git (lemmy.zip)

submitted 2 months ago by cm0002@lemdro.id to c/programmer_humor@programming.dev

66 comments fedilink hide all child comments

you are viewing a single comment's thread
view the rest of the comments

[-] dream_weasel@sh.itjust.works 1 points 1 month ago

Sounds like agreement and resolution are required pre merge conflict resolve.

this post was submitted on 11 Oct 2025

788 points (99.1% liked)

Programmer Humor

27778 readers

1676 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

Feyter@programming.dev

anzo@programming.dev

BurningTurtle@programming.dev

pylapp@programming.dev