alphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 1 year agoHistory repeats itselflemmy.worldimagemessage-square34fedilinkarrow-up1481arrow-down113
arrow-up1468arrow-down1imageHistory repeats itselflemmy.worldalphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 1 year agomessage-square34fedilink
minus-squarerobot_vacuum@discuss.onlinelinkfedilinkarrow-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.
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.