
A better way to look at Git branching for small, growing development teams.
I recently had a client reach out to me to help her fix merge conflicts on a master branch and she was initially a bit lost in how to fix it properly. The solution is to tweak the git-branching model for better results. It’s a big and old codebase, and