1222
A classic (sopuli.xyz)
submitted 2 years ago by [email protected] to c/[email protected]
you are viewing a single comment's thread
view the rest of the comments
[-] [email protected] 32 points 2 years ago

Two new files wouldn't create a merge conflict though (unless they have the same name)?

[-] [email protected] 4 points 2 years ago

Sometimes git just hates you

load more comments (15 replies)
this post was submitted on 26 Aug 2023
1222 points (98.4% liked)

Programmer Humor

36392 readers
138 users here now

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

founded 5 years ago
MODERATORS