• Naomikho@monyet.cc
    link
    fedilink
    arrow-up
    2
    ·
    1 year ago

    Curious question: how many people work on one repo/module/service at your workplace or organization?

    I have been vomiting blood since day1 because of merge conflicts everywhere… I’m still trying to get better at git to make my life easier.

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

      • Naomikho@monyet.cc
        link
        fedilink
        arrow-up
        1
        ·
        1 year 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 😭