you are viewing a single comment's thread
view the rest of the comments
[–] 2 points 2 years ago (1 child)

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.

  • source
  • hideshow 2 child comments
  • [–] 1 point 2 years ago (1 child)

    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.

  • source
  • parent
  • hideshow 2 child comments