minus-squarerobot_vacuum@discuss.onlinetoProgrammer Humor@programming.dev•History repeats itselflinkfedilinkarrow-up1·1 year agoAbout 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. linkfedilink
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.