this post was submitted on 09 Nov 2023
1262 points (98.2% liked)

Programmer Humor

32718 readers
380 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] 5 points 1 year ago

It's the thing you use to create a local copy of the main code base, and then merge your changes back in.

OP hasn't done anything, and there's 7 conflicts between his code and main. Presumably because someone else merged their changes in the time between when OP pulled his local copy and tried to push his (non-existent) changes.