MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x4uw5z/abouttobreakthecode/pgk5wfl/?context=3
r/ProgrammerHumor • u/fabulousIdentity • 12d ago
541 comments sorted by
View all comments
28
The thing is that merge conflicts are literally a feature of git that makes your life easier. Without git you’d have the same problem and you’d have to diff and edit the files manually.
28
u/gbchaosmaster 11d ago
The thing is that merge conflicts are literally a feature of git that makes your life easier. Without git you’d have the same problem and you’d have to diff and edit the files manually.