this post was submitted on 26 Aug 2023
1133 points (98.3% liked)

Programmer Humor

32410 readers
1 users here now

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

Rules:

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

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

[โ€“] tobimai@startrek.website 4 points 2 years ago

Sometimes git just hates you

load more comments (15 replies)