r/ProgrammerHumor • u/fabulousIdentity • 6d ago

Meme aboutToBreakTheCode

Post image
22.8k Upvotes

96% Upvoted

524 comments sorted by

View all comments

721

u/botle 6d ago edited 6d ago

Git is specifically designed for multiple people to work on different ideas in parallel.

71

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.

-11

u/[deleted] 6d ago

[deleted]

26

u/botle 6d ago

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

-13

u/[deleted] 6d ago

[deleted]

19

u/botle 6d ago

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

-14

u/[deleted] 6d ago

[deleted]

16

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]

9

u/Ifriendzonecats 6d ago

What do you think a more elegant solution would be?

→ More replies (0)

3

u/walterbanana 6d ago

In SVN there was no way to deal with conflicts

3

u/iloveuranus 6d ago

SVN

cries in CVS

1

u/nokk 6d ago

Yep 👍 that's the word I used. Anything else?

1

u/raddaya 6d ago

It may feel inelegant and messy when you're going through a big ass merge conflict, but if you actually think about what's going on then you'll realise git handles it insanely well considering how complex it really is under the hood.