DEV Community

Discussion on: Git-flow, non-technical intro.

 
theowlsden profile image
Shaquil Maria

Thanks for the elaboration!

I've had experiences using gitflow with teams of 10+ engineers where there are enormous merge conflicts due to inconsistencies between those develop, staging and master branches

I've seen these conflicts before too. As a junior I thought it was just human error and it's not something that would hinder the development in the long run. Guess I was wrong.

Trunk-based sound great for big teams, I'll have to look into it and see if and how I can propose it to the team when I'm more familiar with it.