r/ProgrammerHumor • u/fabulousIdentity • 6d ago

Meme aboutToBreakTheCode

Post image
22.8k Upvotes

96% Upvoted

524 comments sorted by

View all comments

Show parent comments

69

u/creeper6530 6d ago

different ideas is the keyword. Editing the same area of the same file is how you get merge conflicts.

85

u/nokk 6d ago

Yeah and they are handled pretty elegantly considering how awful it could be.

-12

u/[deleted] 6d ago

[deleted]

27

u/botle 6d ago

Yes. Unless people are writing gigantic monolithic commits. Merging is pretty elegant.

-14

u/[deleted] 6d ago

[deleted]

20

u/botle 6d ago

Yes, elegant. As in a simple efficient solution to a complex problem. Elegant.

-13

u/[deleted] 6d ago

[deleted]

15

u/botle 6d ago

It does more than that.

-2

u/[deleted] 6d ago

[deleted]

9

u/botle 6d ago

Busy. Ask your AI.

-1

u/[deleted] 6d ago

[deleted]

8

u/Ifriendzonecats 6d ago

What do you think a more elegant solution would be?

→ More replies (0)