• robot_vacuum@discuss.online
    link
    fedilink
    arrow-up
    1
    ·
    11 months 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.

    • Naomikho@monyet.cc
      link
      fedilink
      arrow-up
      1
      ·
      11 months ago

      I see… No one cares here and everyone just merges randomly. We have about 20 people working on one repo as well but a lot of times it’s the changes to the same file 😭