Avatar

robot_vacuum

robot_vacuum@discuss.online
Joined
0 posts • 2 comments
Direct message

About 20 developers on one repo in my case, we use a rebase merge strategy with fairly small feature branches so I think that helps keep merge conflicts down. Another thing is our codebase is LARGE, so changes don’t often conflict.

permalink
report
parent
reply

I’ve got a worse one. I was using Windows in a VM the other day and got an ad for Xbox controllers. Basically “check out our new controller colors, click on this notification to go buy one.”

permalink
report
reply