alphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 11 months agoHistory repeats itselflemmy.worldimagemessage-square34fedilinkarrow-up1481arrow-down113
arrow-up1468arrow-down1imageHistory repeats itselflemmy.worldalphacyberranger@lemmy.world to Programmer Humor@programming.devEnglish · 11 months agomessage-square34fedilink
minus-squareNaomikho@monyet.cclinkfedilinkarrow-up2·11 months agoCurious 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.
minus-squarerobot_vacuum@discuss.onlinelinkfedilinkarrow-up1·11 months 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.
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.
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.