this post was submitted on 26 Aug 2023
1220 points (98.4% liked)

Programmer Humor

32725 readers
169 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
[โ€“] [email protected] 32 points 1 year ago (16 children)

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

[โ€“] [email protected] 4 points 1 year ago

Sometimes git just hates you

load more comments (15 replies)