![](https://beehaw.org/pictrs/image/d5ce58c3-e901-4b0b-ae2a-1b97fce04207.png)
![](https://beehaw.org/pictrs/image/7a17afb3-71f4-4ef1-a5ce-d2975ba46c88.png)
2·
1 year agoDepended on the size of the team in my experience. With a project of ~50 devs split into 10 teams, I was having to resolve conflicts perhaps every other PR. But training and standards for workflow can certainly help.
These days, just a retired guy who likes to hike.
Depended on the size of the team in my experience. With a project of ~50 devs split into 10 teams, I was having to resolve conflicts perhaps every other PR. But training and standards for workflow can certainly help.
This exactly. The more developers working on different parts of an application, the more chance of an apparently-easy merge having unforeseen side effects.
git bisect
is the easiest way to narrow down the problem so real debugging can begin.