Monday, April 29, 2013

Working with Git. Our development team is working with Git a lot more and I thought it would be useful to share our workflow. Initial code is checked into a remote branch on a centrally located git server as remote/origin. Developers check the code out to their local branch as master. At the end of a release cycle we branch off remote/origin to remote/sprint. Developers check the code out locally as sprint with the merge option. Individual developers then branch off to a local ${username}DevSprint branch. Once a developer's local changes pass automated tests those changes are merged with the local sprint branch and the pushed to remote/sprint. At the end of the sprint/deployment remote sprint changes are merged with remote/master.

No comments: