this post was submitted on 26 Aug 2023
1221 points (98.5% liked)

Programmer Humor

32415 readers
610 users here now

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

Rules:

founded 5 years ago
MODERATORS
 
you are viewing a single comment's thread
view the rest of the comments
[โ€“] homoludens@feddit.de 31 points 1 year ago (16 children)

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

[โ€“] tobimai@startrek.website 4 points 1 year ago

Sometimes git just hates you

load more comments (15 replies)