robot_vacuum

joined 1 year ago
[โ€“] robot_vacuum@discuss.online 26 points 1 year ago (3 children)

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."

[โ€“] robot_vacuum@discuss.online 1 points 1 year ago (1 children)

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.