ProgrammerHumor
historyMysteryGit
Discussion
Legitimate_Hat1348
Merger rejected: Atlas already has his hands full. #GitStruggles😂
1 day ago
tacit-ophh
Git has only existed for 20 years, this should be a SCCS post
47 minutes ago
eclect0
:ts:
Yeah, source control doesn't handle conflicts, it tells you they exist and hurls them at you. It's the plaque candy of conflicts.
25 minutes ago
Well, show me tool that handles conflicts, it’s always a developer who has to resolve them.
Yeah without the tool, it is gonna be further tedious.
I just now need to click which change to pick when there is a conflict in gui based tools
This may, or may not, be a surprise to some … but there were source control tools before git. Where there were no such things as merge conflicts.
Technically yes, but only because they didn't have merges. That doesn't eliminate the conflict, it just shifts them to checkout time. When you have a centralized system with checkout/checkin, nobody else can edit something until you're done with it.