22
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
this post was submitted on 23 Jun 2023
22 points (100.0% liked)
Programming
13361 readers
2 users here now
All things programming and coding related. Subcommunity of Technology.
This community's icon was made by Aaron Schneider, under the CC-BY-NC-SA 4.0 license.
founded 1 year ago
MODERATORS
With ~10 people on the team, many products, and dozens of repositories that we maintain, rarely. Maybe a few times per month. In the two years I've been with this company, I haven't run into a single merge conflict that wasn't straightforward to sort out.