DEV Community

Discussion on: Git Workflow: Do you commit to master on your solo projects?

Collapse
 
darkain profile image
Vincent Milum Jr

In my place, "master" IS the development branch, and then there is a "live" branch for once we're ready to push things into production. The projects themselves though are designed in such a way that multiple people can work on independent sections with zero merge conflicts. This is all part of the actual architectural design of the framework in place. "Everything is an island" in that every feature / module / whatever are entirely isolated in the code from one-another.

Collapse
 
daveskull81 profile image
dAVE Inden

Do you ever have issues with when the work is merged and coordinating that? Do you ever have a situation where someone's work is dependent on the work being done by someone else being merge in first?