I still remember we had to fix merge conflicts by hand, back in the day

Sep 9, 2026 · 10:21 AM UTC

31
9
173
9,956
Sort replies: Relevant Recent Liked
Replying to @mweststrate
i just got shivers..
1
1
272
Wild, right!
1
1
268
more replies
Replying to @mweststrate
And rebase by hand 😅
3
187
Replying to @mweststrate
on don't get me started
1
104
Replying to @mweststrate
Greetings from an existing immer user!
2
274
Replying to @mweststrate
Ah yes, svn merges. I still am not sure if those merges were done correctly.
2
201
Replying to @mweststrate
😭😭😭
2
86
Replying to @mweststrate
Only low performing teams though
2
151
Replying to @mweststrate
Feels so long ago
1
253
Replying to @mweststrate
Oh, good (shitty) old times
1
114
Replying to @mweststrate
What nightmares are made of 😅
1
123
Replying to @mweststrate
Yeah thank God those days are over.
1
82
Replying to @mweststrate
I’m glad that era is over, sincerely
1
136
Replying to @mweststrate
Literally 8 months ago. Life is crazy
1
33
Replying to @mweststrate
1
70
Replying to @mweststrate
Shit times.
1
39
Replying to @mweststrate
what a time
64
Replying to @mweststrate
I'm a chevrons man myself (or was)
138
Replying to @mweststrate
Speed was our moat.. ship stuff faster to avoid merge conflicts
61
Replying to @mweststrate
Ah, a baseless merge in TFS. Today’s kids will never know.
244
Replying to @mweststrate
are modern auto-resolvers actually maintaining AST-level semantic invariants, or are we just trading mechanical syntax conflicts for silent state corruption at runtime?
7
Replying to @mweststrate
Those hand-resolved conflicts built character and a healthy fear of force pushes
77
Replying to @mweststrate
Or debug logs manually. Can you imagine going back?
23
Replying to @mweststrate
Bad times ..!
126
Replying to @mweststrate
still don’t quite know how people are using that extra time they get now
73
Replying to @mweststrate
I remember 4 programmers sitting in one office together merging 68000 game code every Friday afternoon.
27
Replying to @mweststrate
It was horrible
41
Replying to @mweststrate
i still do it sometimes, if they are small
59
Replying to @mweststrate
ye olde 6 months ago...
23
Replying to @mweststrate
@mweststrate please open dms have smth really important to talk about
88
Load more