In today's deployment, one of our previous adhoc fix was lost since I miss the merge from fix to development branch. In order to avoid that from happening again, I will try to use a different branching approach:
Named development branches
This are development branches use for implementation of different features. It can only contain code on story and merge from _production branch. In this way, individual story can be deployed to production without including other stories.
master branch
This is the branch that merge named development branches for the features that's going to be release to staging/production server. It can contains codes from all dev branches and _production branch.
_staging branch
This is the branch in sync with staging release, every deployment to staging server mush be on this branch. Merges from master, dev and/or _production branches for deployment.
_production branch
This is the branch in sync with production release, every deployment to production server must be on this branch. Merges from _staging branch for deployment. Any urgent or adhoc fixes on production branches should be merged to at least master and _staging branch according.
No comments:
Post a Comment
Note: Only a member of this blog may post a comment.