• robot_vacuum@discuss.online
    link
    fedilink
    arrow-up
    1
    ·
    1 year ago

    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.