re: How to organize your git branches VIEW POST

re: I have done both, Trunk Based Development is the way to go for teams with high code velocity. Feature branches can be manageable for very small tea...

We’ve also used both for a team of 6 and Feature branches often end in merge conflicts especially at the end of a sprint. Although you can build it, it usually prevents you deploying and system testing your code on a production like environment. Quick feedback is important. So we commit on develop branch and only follow git flow for releases.

Yeah I do commits on dev branch as well. I always pull from dev to prevent conflicts, but you don't always win but it's not a last minute scramble to get the code on the feature if too close on the files working.

code of conduct - report abuse