Merge Conflicts
TC: 🥜 YOE: 6 Does your team deal with huge amounts of merge conflicts on a weekly basis? What do you think this is a sign of? How do you remidy these issues?
We have monorepo and we are just fine with 200 engineers.
It means you are waiting too long to push your wip.
My team lead sits on PRs for days.
There’s your problem. Seriously. Either your team lead needs to cut back on other responsibilities so they can review PRs promptly or your team needs more people who can review. Bring it up with your lead and/or manager.
Pull from master every morning homie
Team is being productive I guess.
No, we don’t. We isolate and time work so developers are not stepping on each other with the app codebase.
Maybe structure branches hierarchically?
It’s a problem with shitty, monolithic spaghetti code. Refactor. Use DI.
Set Fast forward only on the repo and rebase locally as previously stated.
Probably a combination of sitting on branches for too long and not enough communication between team members?
Refactor, you have a monolithic repo that’s been (mis)architected with too much interdependence and excessively tight coupling of core logic.
Sadly probably not your choice, but this. Y'all are going to have a bad time.
We are currently building a new app. Most merge conflicts are coming from engineers working in the same components. Or engineers making small changes through out the codebase such as renaming files, moving/deleting files, etc. The engineers on my team are somewhat new to building software.