Closed brad-sf closed 8 years ago
I propose that in the Github settings for this repo that dev be the default branch.
dev
Here's how I see the branching structure working:
master -> dev -> feature-xyz -> dev -> master
master
feature-xyz
production
staging
local
BF-FixFellowshipFinderGeoLogic-22Apr16
The advantage of having dev default is that it becomes the default branch opened when viewing the repo on Github, and it is the default branch selected when creating a pull-request.
Done ;)
I propose that in the Github settings for this repo that
dev
be the default branch.Here's how I see the branching structure working:
Git branching workflow
master
->dev
->feature-xyz
->dev
->master
master
= Live onproduction
and anystaging
servers.dev
= Livedev
servers, merged back intomaster
, default branch.feature-xyz
local
branch off ofdev
, per feature, pull requested intodev
, then deleted.Branch Naming convention
BF-FixFellowshipFinderGeoLogic-22Apr16